diff --git a/pydocx/constants.py b/pydocx/constants.py
index 9f7c1788..435a20a7 100644
--- a/pydocx/constants.py
+++ b/pydocx/constants.py
@@ -33,6 +33,12 @@
 
 POINTS_PER_EM = 12
 
+# Defined in 17.15.1.25
+DEFAULT_AUTOMATIC_TAB_STOP_INTERVAL = 720  # twips
+
+# Define the whitespace character
+HTML_WHITE_SPACE = ' '
+
 PYDOCX_STYLES = {
     'insert': {
         'color': 'green',
diff --git a/pydocx/export/base.py b/pydocx/export/base.py
index 67b002bc..ae1b3330 100644
--- a/pydocx/export/base.py
+++ b/pydocx/export/base.py
@@ -31,6 +31,7 @@ def __init__(self, path):
         self.footnote_tracker = []
 
         self.captured_runs = None
+        self.paragraphs = []
         self.complex_field_runs = []
 
         self.node_type_to_export_func_map = {
@@ -299,6 +300,11 @@ def yield_body_children(self, body):
         return self.yield_numbering_spans(body.children)
 
     def export_paragraph(self, paragraph):
+        if self.first_pass:
+            # To properly handle contextual spacing we need to know what is the style
+            # of the previous and next paragraphs. So, we save all the paragraphs here.
+            self.paragraphs.append(paragraph)
+
         children = self.yield_paragraph_children(paragraph)
         results = self.yield_nested(children, self.export_node)
         if paragraph.effective_properties:
@@ -310,10 +316,7 @@ def yield_paragraph_children(self, paragraph):
             yield child
 
     def get_paragraph_styles_to_apply(self, paragraph):
-        properties = paragraph.effective_properties
         property_rules = [
-            (properties.justification, self.export_paragraph_property_justification),
-            (True, self.export_paragraph_property_indentation),
         ]
         for actual_value, handler in property_rules:
             if actual_value:
@@ -338,7 +341,6 @@ def export_run(self, run):
         if self.first_pass:
             if self.captured_runs is not None:
                 self.captured_runs.append(run)
-
         # TODO squash multiple sequential text nodes into one?
         results = self.yield_nested(run.children, self.export_node)
         if run.effective_properties:
diff --git a/pydocx/export/html.py b/pydocx/export/html.py
index 18e3ea53..f3e0f50d 100644
--- a/pydocx/export/html.py
+++ b/pydocx/export/html.py
@@ -5,7 +5,6 @@
     print_function,
     unicode_literals,
 )
-
 import base64
 import posixpath
 from itertools import chain
@@ -17,7 +16,8 @@
     POINTS_PER_EM,
     PYDOCX_STYLES,
     TWIPS_PER_POINT,
-    EMUS_PER_PIXEL
+    EMUS_PER_PIXEL,
+    HTML_WHITE_SPACE
 )
 from pydocx.export.base import PyDocXExporter
 from pydocx.export.numbering_span import NumberingItem
@@ -101,6 +101,7 @@ def __init__(
             allow_self_closing=False,
             closed=False,
             allow_whitespace=False,
+            custom_text=None,
             **attrs
     ):
         self.tag = tag
@@ -108,6 +109,7 @@ def __init__(
         self.attrs = attrs
         self.closed = closed
         self.allow_whitespace = allow_whitespace
+        self.custom_text = custom_text
 
     def apply(self, results, allow_empty=True):
         if not allow_empty:
@@ -116,6 +118,10 @@ def apply(self, results, allow_empty=True):
                 return
 
         sequence = [[self]]
+
+        if self.custom_text:
+            sequence.append([self.custom_text])
+
         if results is not None:
             sequence.append(results)
 
@@ -178,6 +184,18 @@ def style(self):
         styles = {
             'body': {
                 'margin': '0px auto',
+            },
+            'p': {
+                'margin-top': '0',
+                'margin-bottom': '0'
+            },
+            'ol': {
+                'margin-top': '0',
+                'margin-bottom': '0'
+            },
+            'ul': {
+                'margin-top': '0',
+                'margin-bottom': '0'
             }
         }
 
@@ -248,17 +266,20 @@ def export_footnote(self, footnote):
         return tag.apply(results, allow_empty=False)
 
     def get_paragraph_tag(self, paragraph):
+        if isinstance(paragraph.parent, wordprocessing.TableCell):
+            cell_properties = paragraph.parent.properties
+            if cell_properties and cell_properties.is_continue_vertical_merge:
+                # We ignore such paragraphs here because are added via rowspan
+                return
+        if paragraph.is_empty:
+            return HtmlTag('p', custom_text=HTML_WHITE_SPACE)
+
         heading_style = paragraph.heading_style
         if heading_style:
             tag = self.get_heading_tag(paragraph)
             if tag:
                 return tag
-        if self.in_table_cell:
-            return
-        if paragraph.has_structured_document_parent():
-            return
-        if isinstance(paragraph.parent, NumberingItem):
-            return
+
         return HtmlTag('p')
 
     def get_heading_tag(self, paragraph):
@@ -277,12 +298,10 @@ def get_heading_tag(self, paragraph):
     def export_paragraph(self, paragraph):
         results = super(PyDocXHTMLExporter, self).export_paragraph(paragraph)
 
-        results = is_not_empty_and_not_only_whitespace(results)
-        if results is None:
-            return
-
         tag = self.get_paragraph_tag(paragraph)
         if tag:
+            attrs = self.get_paragraph_styles(paragraph)
+            tag.attrs.update(attrs)
             results = tag.apply(results)
 
         for result in results:
@@ -291,9 +310,21 @@ def export_paragraph(self, paragraph):
     def export_paragraph_property_justification(self, paragraph, results):
         # TODO these classes could be applied on the paragraph, and not as
         # inline spans
-        alignment = paragraph.effective_properties.justification
         # TODO These alignment values are for traditional conformance. Strict
         # conformance uses different values
+        attrs = self.get_paragraph_property_justification(paragraph)
+        if attrs:
+            tag = HtmlTag('span', **attrs)
+            results = tag.apply(results, allow_empty=False)
+        return results
+
+    def get_paragraph_property_justification(self, paragraph):
+        attrs = {}
+        if not paragraph.effective_properties:
+            return attrs
+
+        alignment = paragraph.effective_properties.justification
+
         if alignment in [JUSTIFY_LEFT, JUSTIFY_CENTER, JUSTIFY_RIGHT]:
             pydocx_class = 'pydocx-{alignment}'.format(
                 alignment=alignment,
@@ -301,42 +332,174 @@ def export_paragraph_property_justification(self, paragraph, results):
             attrs = {
                 'class': pydocx_class,
             }
-            tag = HtmlTag('span', **attrs)
-            results = tag.apply(results, allow_empty=False)
         elif alignment is not None:
             # TODO What if alignment is something else?
             pass
-        return results
+
+        return attrs
 
     def export_paragraph_property_indentation(self, paragraph, results):
         # TODO these classes should be applied on the paragraph, and not as
         # inline styles
 
-        properties = paragraph.effective_properties
+        attrs = self.get_paragraph_property_indentation(paragraph)
+
+        if attrs:
+            tag = HtmlTag('span', **attrs)
+            results = tag.apply(results, allow_empty=False)
+
+        return results
 
+    def get_paragraph_property_spacing(self, paragraph):
         style = {}
+        if self.first_pass:
+            return style
 
-        # Numbering properties can define a text indentation on a paragraph
-        if properties.numbering_properties:
-            indentation_left = None
-            indentation_first_line = None
+        try:
+            current_par_index = self.paragraphs.index(paragraph)
+        except ValueError:
+            return style
+
+        previous_paragraph = None
+        next_paragraph = None
+        previous_paragraph_spacing = None
+        next_paragraph_spacing = None
+        spacing_after = None
+        spacing_before = None
+
+        current_paragraph_spacing = paragraph.get_spacing()
+
+        if current_par_index > 0:
+            previous_paragraph = self.paragraphs[current_par_index - 1]
+            previous_paragraph_spacing = previous_paragraph.get_spacing()
+        if current_par_index < len(self.paragraphs) - 1:
+            next_paragraph = self.paragraphs[current_par_index + 1]
+            next_paragraph_spacing = next_paragraph.get_spacing()
+
+        if next_paragraph:
+            current_after = current_paragraph_spacing['after'] or 0
+            next_before = next_paragraph_spacing['before'] or 0
+
+            same_style = current_paragraph_spacing['parent_style'] == \
+                next_paragraph_spacing['parent_style']
+
+            if same_style:
+                if not current_paragraph_spacing['contextual_spacing']:
+                    if next_paragraph_spacing['contextual_spacing']:
+                        spacing_after = current_after
+                    else:
+                        if current_after > next_before:
+                            spacing_after = current_after
+            else:
+                if current_after > next_before:
+                    spacing_after = current_after
+        else:
+            spacing_after = current_paragraph_spacing['after']
+
+        if previous_paragraph:
+            current_before = current_paragraph_spacing['before'] or 0
+            prev_after = previous_paragraph_spacing['after'] or 0
+
+            same_style = current_paragraph_spacing['parent_style'] == \
+                previous_paragraph_spacing['parent_style']
+
+            if same_style:
+                if not current_paragraph_spacing['contextual_spacing']:
+                    if previous_paragraph_spacing['contextual_spacing']:
+                        if current_before > prev_after:
+                            spacing_before = current_before - prev_after
+                        else:
+                            spacing_before = 0
+                    else:
+                        if current_before > prev_after:
+                            spacing_before = current_before
+            else:
+                if current_before > prev_after:
+                    spacing_before = current_before
+        else:
+            spacing_before = current_paragraph_spacing['before']
+
+        if current_paragraph_spacing['line']:
+            style['line-height'] = '{0}%'.format(current_paragraph_spacing['line'] * 100)
 
-            paragraph_num_level = paragraph.get_numbering_level()
+        if spacing_after:
+            style['margin-bottom'] = '{0:.2f}em'.format(convert_twips_to_ems(spacing_after))
 
-            if paragraph_num_level:
-                listing_style = self.export_listing_paragraph_property_indentation(
-                    paragraph,
-                    paragraph_num_level.paragraph_properties,
-                    include_text_indent=True
+        if spacing_before:
+            style['margin-top'] = '{0:.2f}em'.format(convert_twips_to_ems(spacing_before))
+
+        if style:
+            style = {
+                'style': convert_dictionary_to_style_fragment(style)
+            }
+
+        return style
+
+    def get_paragraph_property_indentation(self, paragraph):
+        style = {}
+        attrs = {}
+        properties = paragraph.effective_properties
+
+        indentation_right = None
+        indentation_left = 0
+        indentation_first_line = None
+        span_paragraph_properties = None
+        span_indentation_left = 0
+
+        try:
+            if isinstance(paragraph.parent, NumberingItem):
+                span_paragraph_properties = paragraph.parent.numbering_span.numbering_level.\
+                    paragraph_properties
+                span_indentation_left = span_paragraph_properties.to_int(
+                    'indentation_left',
+                    default=0
                 )
-                if 'text-indent' in listing_style and listing_style['text-indent'] != '0.00em':
-                    style['text-indent'] = listing_style['text-indent']
-                    style['display'] = 'inline-block'
-        else:
-            indentation_left = properties.to_int('indentation_left')
-            indentation_first_line = properties.to_int('indentation_first_line')
+                span_indentation_hanging = span_paragraph_properties.to_int(
+                    'indentation_hanging',
+                    default=0
+                )
+                if span_paragraph_properties:
+                    indentation_left -= (span_indentation_left - span_indentation_hanging)
 
-        indentation_right = properties.to_int('indentation_right')
+        except AttributeError:
+            pass
+
+        if properties:
+            indentation_right = properties.to_int('indentation_right')
+
+            if properties.numbering_properties is None:
+                # For paragraph inside list we need to properly adjust indentations
+                # by recalculating their indentations based on the parent span
+                indentation_left = properties.to_int('indentation_left', default=0)
+                indentation_first_line = properties.to_int('indentation_first_line', default=0)
+
+                if isinstance(paragraph.parent, NumberingItem):
+                    if properties.is_list_paragraph and properties.no_indentation:
+                        indentation_left = 0
+                    elif span_paragraph_properties:
+                        indentation_left -= span_indentation_left
+                        # In this case we don't need to set text-indent separately because
+                        # it's part of the left margin
+                        indentation_left += indentation_first_line
+                        indentation_first_line = None
+                    else:
+                        # TODO Here we may encounter fake lists and not always margins are
+                        # set properly.
+                        pass
+            else:
+                indentation_left = None
+                indentation_first_line = None
+                paragraph_num_level = paragraph.get_numbering_level()
+
+                if paragraph_num_level:
+                    listing_style = self.export_listing_paragraph_property_indentation(
+                        paragraph,
+                        paragraph_num_level.paragraph_properties,
+                        include_text_indent=True
+                    )
+                    if 'text-indent' in listing_style and \
+                            listing_style['text-indent'] != '0.00em':
+                        style['text-indent'] = listing_style['text-indent']
 
         if indentation_right:
             right = convert_twips_to_ems(indentation_right)
@@ -349,16 +512,34 @@ def export_paragraph_property_indentation(self, paragraph, results):
         if indentation_first_line:
             first_line = convert_twips_to_ems(indentation_first_line)
             style['text-indent'] = '{0:.2f}em'.format(first_line)
-            style['display'] = 'inline-block'
 
         if style:
             attrs = {
                 'style': convert_dictionary_to_style_fragment(style)
             }
-            tag = HtmlTag('span', **attrs)
-            results = tag.apply(results, allow_empty=False)
 
-        return results
+        return attrs
+
+    def get_paragraph_styles(self, paragraph):
+        attributes = {}
+
+        property_rules = [
+            (True, self.get_paragraph_property_justification),
+            (True, self.get_paragraph_property_indentation),
+            (True, self.get_paragraph_property_spacing),
+        ]
+        for actual_value, handler in property_rules:
+            if actual_value:
+                handler_results = handler(paragraph)
+                for attr_name in ['style', 'class']:
+                    new_value = handler_results.get(attr_name, '')
+                    if new_value:
+                        if attr_name in attributes:
+                            attributes[attr_name] += ';%s' % new_value
+                        else:
+                            attributes[attr_name] = '%s' % new_value
+
+        return attributes
 
     def export_listing_paragraph_property_indentation(
             self,
@@ -435,7 +616,7 @@ def export_listing_paragraph_property_indentation(
             margin_left = convert_twips_to_ems(margin_left)
             style['margin-left'] = '{0:.2f}em'.format(margin_left)
 
-        # we don't allow negative hanging
+        # We don't allow negative hanging
         if hanging < 0:
             hanging = 0
 
@@ -671,9 +852,10 @@ def export_table_cell(self, table_cell):
             tag = HtmlTag('td', **attrs)
 
         numbering_spans = self.yield_numbering_spans(table_cell.children)
-        results = self.yield_nested_with_line_breaks_between_paragraphs(
+
+        results = self.yield_nested(
             numbering_spans,
-            self.export_node,
+            self.export_node
         )
         if tag:
             results = tag.apply(results)
@@ -819,19 +1001,16 @@ def export_numbering_span(self, numbering_span):
         return tag.apply(results)
 
     def export_numbering_item(self, numbering_item):
-        results = self.yield_nested_with_line_breaks_between_paragraphs(
-            numbering_item.children,
-            self.export_node,
-        )
+        results = super(PyDocXHTMLExporter, self).export_numbering_item(numbering_item)
 
         style = None
 
         if numbering_item.children:
-            level_properties = numbering_item.numbering_span.\
+            level_properties = numbering_item.numbering_span. \
                 numbering_level.paragraph_properties
             # get the first paragraph properties which will contain information
             # on how to properly indent listing item
-            paragraph = numbering_item.children[0]
+            paragraph = numbering_item.get_first_child()
 
             style = self.export_listing_paragraph_property_indentation(paragraph,
                                                                        level_properties)
diff --git a/pydocx/export/numbering_span.py b/pydocx/export/numbering_span.py
index 809ff672..1986c4dd 100644
--- a/pydocx/export/numbering_span.py
+++ b/pydocx/export/numbering_span.py
@@ -14,9 +14,7 @@
 from pydocx.openxml.wordprocessing.tab_char import TabChar
 from pydocx.openxml.wordprocessing.text import Text
 from pydocx.util.memoize import memoized
-
-# Defined in 17.15.1.25
-DEFAULT_AUTOMATIC_TAB_STOP_INTERVAL = 720  # twips
+from pydocx.constants import DEFAULT_AUTOMATIC_TAB_STOP_INTERVAL
 
 roman_numeral_map = tuple(zip(
     (1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1),
diff --git a/pydocx/models.py b/pydocx/models.py
index a8b2e2b6..cf472cc8 100644
--- a/pydocx/models.py
+++ b/pydocx/models.py
@@ -308,6 +308,8 @@ def load(cls, element, **load_kwargs):
             if field.name is not None:
                 attr_name = field.name
             value = element.attrib.get(attr_name, field.default)
+            if callable(field.type):
+                value = field.type(value)
             kwargs[field_name] = value
 
         # Child tag fields may specify a handler/type, which is responsible for
@@ -395,3 +397,11 @@ def child_handler(child):
 
         # Create a new instance using the values we've calculated
         return cls(**kwargs)
+
+    @property
+    def default_doc_styles(self):
+        part = getattr(self.container, 'style_definitions_part', None)
+        if part:
+            return part.styles.doc_defaults
+
+        return None
diff --git a/pydocx/openxml/packaging/style_definitions_part.py b/pydocx/openxml/packaging/style_definitions_part.py
index 7f1cda25..347e0ec0 100644
--- a/pydocx/openxml/packaging/style_definitions_part.py
+++ b/pydocx/openxml/packaging/style_definitions_part.py
@@ -51,28 +51,39 @@ def get_style_chain_stack(self, style_type, style_id):
         styleB
         styleC
         '''
-        visited_styles = set()
-        visited_styles.add(style_id)
 
+        visited_styles = set()
         styles = self.styles.get_styles_by_type(style_type)
-        base_style = styles.get(style_id)
-
-        if base_style:
-            yield base_style
-
-        # Build up the stack of styles to merge together
-        current_style = base_style
-        while current_style:
-            if not current_style.parent_style:
-                # The current style doesn't have a parent style
-                break
-            if current_style.parent_style in visited_styles:
-                # Loop detected
-                break
-            style = styles.get(current_style.parent_style)
-            if not style:
-                # Style doesn't exist
-                break
-            visited_styles.add(style.style_id)
-            yield style
-            current_style = style
+        styles_to_apply = {}
+
+        def yield_styles_parent_stack(base_style):
+            if base_style:
+                yield base_style
+
+            # Build up the stack of styles to merge together
+            current_style = base_style
+            while current_style:
+                if not current_style.parent_style:
+                    # The current style doesn't have a parent style
+                    break
+                if current_style.parent_style in visited_styles:
+                    # Loop detected
+                    break
+                style = styles.get(current_style.parent_style)
+                if not style:
+                    # Style doesn't exist
+                    break
+                visited_styles.add(style.style_id)
+                yield style
+                current_style = style
+
+        if not style_id:
+            # In this case we need to check the default defined styles
+            styles_to_apply = self.styles.get_default_styles_by_type(style_type)
+        else:
+            styles_to_apply[style_id] = styles.get(style_id)
+
+        for style_id, style in styles_to_apply.items():
+            visited_styles.add(style_id)
+            for s in yield_styles_parent_stack(style):
+                yield s
diff --git a/pydocx/openxml/wordprocessing/abstract_num.py b/pydocx/openxml/wordprocessing/abstract_num.py
index cdad313e..63116793 100644
--- a/pydocx/openxml/wordprocessing/abstract_num.py
+++ b/pydocx/openxml/wordprocessing/abstract_num.py
@@ -5,6 +5,7 @@
     unicode_literals,
 )
 
+from pydocx.constants import DEFAULT_AUTOMATIC_TAB_STOP_INTERVAL
 from pydocx.models import XmlModel, XmlChild, XmlAttribute, XmlCollection
 from pydocx.openxml.wordprocessing.level import Level
 
@@ -40,7 +41,7 @@ def get_indentation_between_levels(self):
             lvl1_ind = self.levels[1].paragraph_properties.to_int('indentation_left',
                                                                   default=0)
             ind_step = lvl1_ind - lvl0_ind
-        except IndexError:
-            ind_step = 720  # default one
+        except (IndexError, AttributeError):
+            ind_step = DEFAULT_AUTOMATIC_TAB_STOP_INTERVAL  # default one
 
         return ind_step
diff --git a/pydocx/openxml/wordprocessing/doc_defaults.py b/pydocx/openxml/wordprocessing/doc_defaults.py
new file mode 100644
index 00000000..b76d4a54
--- /dev/null
+++ b/pydocx/openxml/wordprocessing/doc_defaults.py
@@ -0,0 +1,29 @@
+# coding: utf-8
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+)
+
+from pydocx.models import XmlModel, XmlChild
+from pydocx.openxml.wordprocessing.paragraph_properties import ParagraphProperties
+from pydocx.openxml.wordprocessing.run_properties import RunProperties
+
+
+class ParagraphStyleDefaults(XmlModel):
+    XML_TAG = 'pPrDefault'
+
+    properties = XmlChild(type=ParagraphProperties)
+
+
+class RunStyleDefaults(XmlModel):
+    XML_TAG = 'rPrDefault'
+
+    properties = XmlChild(type=RunProperties)
+
+
+class DocDefaults(XmlModel):
+    XML_TAG = 'docDefaults'
+
+    paragraph = XmlChild(type=ParagraphStyleDefaults)
+    run = XmlChild(type=RunStyleDefaults)
diff --git a/pydocx/openxml/wordprocessing/paragraph.py b/pydocx/openxml/wordprocessing/paragraph.py
index bdb6b387..3b26a46e 100644
--- a/pydocx/openxml/wordprocessing/paragraph.py
+++ b/pydocx/openxml/wordprocessing/paragraph.py
@@ -4,19 +4,20 @@
     print_function,
     unicode_literals,
 )
-from pydocx.util.memoize import memoized
+
 from pydocx.models import XmlModel, XmlCollection, XmlChild
+from pydocx.openxml.wordprocessing.bookmark import Bookmark
+from pydocx.openxml.wordprocessing.deleted_run import DeletedRun
 from pydocx.openxml.wordprocessing.hyperlink import Hyperlink
+from pydocx.openxml.wordprocessing.inserted_run import InsertedRun
 from pydocx.openxml.wordprocessing.paragraph_properties import ParagraphProperties  # noqa
 from pydocx.openxml.wordprocessing.run import Run
-from pydocx.openxml.wordprocessing.tab_char import TabChar
-from pydocx.openxml.wordprocessing.text import Text
-from pydocx.openxml.wordprocessing.smart_tag_run import SmartTagRun
-from pydocx.openxml.wordprocessing.inserted_run import InsertedRun
-from pydocx.openxml.wordprocessing.deleted_run import DeletedRun
 from pydocx.openxml.wordprocessing.sdt_run import SdtRun
 from pydocx.openxml.wordprocessing.simple_field import SimpleField
-from pydocx.openxml.wordprocessing.bookmark import Bookmark
+from pydocx.openxml.wordprocessing.smart_tag_run import SmartTagRun
+from pydocx.openxml.wordprocessing.tab_char import TabChar
+from pydocx.openxml.wordprocessing.text import Text
+from pydocx.util.memoize import memoized
 
 
 class Paragraph(XmlModel):
@@ -35,17 +36,83 @@ class Paragraph(XmlModel):
         Bookmark
     )
 
-    def __init__(self, **kwargs):
-        super(Paragraph, self).__init__(**kwargs)
-        self._effective_properties = None
+    @property
+    def is_empty(self):
+        if not self.children:
+            return True
+
+        # we may have cases when a paragraph has a Bookmark with name '_GoBack'
+        # and we should treat it as empty paragraph
+        if len(self.children) == 1:
+            first_child = self.children[0]
+            if isinstance(first_child, Bookmark) and \
+                    first_child.name in ('_GoBack',):
+                return True
+            # We can have cases when only run properties are defined and no text
+            elif not getattr(first_child, "children", None):
+                return True
+        return False
+
+    def _get_properties_inherited_from_parent_table(self):
+        from pydocx.openxml.wordprocessing.table import Table
+
+        inherited_properties = {}
+
+        parent_table = self.get_first_ancestor(Table)
+        if parent_table:
+            style_stack = parent_table.get_style_chain_stack()
+            for style in reversed(list(style_stack)):
+                if style.paragraph_properties:
+                    inherited_properties.update(
+                        dict(style.paragraph_properties.fields),
+                    )
+        return inherited_properties
+
+    def _get_inherited_properties_from_parent_style(self):
+        inherited_properties = {}
+        style_stack = self.get_style_chain_stack()
+        for style in reversed(list(style_stack)):
+            if style.paragraph_properties:
+                inherited_properties.update(
+                    dict(style.paragraph_properties.fields),
+                )
+        return inherited_properties
 
     @property
+    def inherited_properties(self):
+        properties = {}
+
+        if self.default_doc_styles and \
+                getattr(self.default_doc_styles.paragraph, 'properties'):
+            properties.update(
+                dict(self.default_doc_styles.paragraph.properties.fields),
+            )
+        properties.update(
+            self._get_inherited_properties_from_parent_style(),
+        )
+        # Tables can also define custom paragraph pr
+        properties.update(
+            self._get_properties_inherited_from_parent_table(),
+        )
+
+        # TODO When enable this make sure that you check the paragraph margins logic
+        # numbering_level = self.get_numbering_level()
+        # if numbering_level and numbering_level.paragraph_properties:
+        #     properties.update(
+        #         dict(numbering_level.paragraph_properties.fields),
+        #     )
+
+        return ParagraphProperties(**properties)
+
+    @property
+    @memoized
     def effective_properties(self):
-        # TODO need to calculate effective properties like Run
-        if not self._effective_properties:
-            properties = self.properties
-            self._effective_properties = properties
-        return self._effective_properties
+        inherited_properties = self.inherited_properties
+        effective_properties = {}
+        effective_properties.update(dict(inherited_properties.fields))
+        if self.properties:
+            effective_properties.update(dict(self.properties.fields))
+        return ParagraphProperties(**effective_properties)
 
     @property
     def numbering_definition(self):
@@ -56,12 +123,9 @@ def has_structured_document_parent(self):
         return self.has_ancestor(SdtBlock)
 
     def get_style_chain_stack(self):
-        if not self.properties:
-            return
-
-        parent_style = self.properties.parent_style
-        if not parent_style:
-            return
+        # Even if parent style is not defined we still need to check the default style
+        # properties applied
+        parent_style = getattr(self.properties, 'parent_style', None)
 
         # TODO the getattr is necessary because of footnotes. From the context
         # of a footnote, a paragraph's container is the footnote part, which
@@ -97,9 +161,9 @@ def get_numbering_definition(self):
         part = getattr(self.container, 'numbering_definitions_part', None)
         if not part:
             return
-        if not self.effective_properties:
+        if not self.properties:
             return
-        numbering_properties = self.effective_properties.numbering_properties
+        numbering_properties = self.properties.numbering_properties
         if not numbering_properties:
             return
         return part.numbering.get_numbering_definition(
@@ -111,9 +175,9 @@ def get_numbering_level(self):
         numbering_definition = self.get_numbering_definition()
         if not numbering_definition:
             return
-        if not self.effective_properties:
+        if not self.properties:
             return
-        numbering_properties = self.effective_properties.numbering_properties
+        numbering_properties = self.properties.numbering_properties
         if not numbering_properties:
             return
         return numbering_definition.get_level(
@@ -206,3 +270,39 @@ def get_indentation(self, indentation, only_level_ind=False):
                 ind = level.paragraph_properties.to_int(indentation, default=0)
 
         return ind
+
+    def get_spacing(self):
+        """Get paragraph spacing according to:
+                ECMA-376, 3rd Edition (June, 2011),
+                Fundamentals and Markup Language Reference § 17.3.1.33.
+        """
+        results = {
+            'line': None,
+            'after': None,
+            'before': None,
+            'contextual_spacing': bool(self.effective_properties.contextual_spacing),
+            'parent_style': self.effective_properties.parent_style
+        }
+
+        spacing_properties = self.effective_properties.spacing_properties
+
+        if spacing_properties is None:
+            return results
+
+        spacing_line = spacing_properties.to_int('line')
+        spacing_after = spacing_properties.to_int('after')
+        spacing_before = spacing_properties.to_int('before')
+
+        if spacing_line:
+            line = float("%.2f" % (spacing_line / 240.0))
+            # default line spacing is 1 so no need to add attribute
+            if line != 1.0:
+                results['line'] = line
+
+        if spacing_after is not None:
+            results['after'] = spacing_after
+
+        if spacing_before is not None:
+            results['before'] = spacing_before
+
+        return results
diff --git a/pydocx/openxml/wordprocessing/paragraph_properties.py b/pydocx/openxml/wordprocessing/paragraph_properties.py
index c6bbc374..dd1e6712 100644
--- a/pydocx/openxml/wordprocessing/paragraph_properties.py
+++ b/pydocx/openxml/wordprocessing/paragraph_properties.py
@@ -7,6 +7,8 @@
 
 from pydocx.models import XmlModel, XmlChild
 from pydocx.openxml.wordprocessing.numbering_properties import NumberingProperties  # noqa
+from pydocx.openxml.wordprocessing.paragraph_spacing import ParagraphSpacing
+from pydocx.types import OnOff
 
 
 class ParagraphProperties(XmlModel):
@@ -25,6 +27,10 @@ class ParagraphProperties(XmlModel):
     indentation_first_line = XmlChild(name='ind', attrname='firstLine')
     indentation_hanging = XmlChild(name='ind', attrname='hanging')
 
+    contextual_spacing = XmlChild(type=OnOff, name='contextualSpacing', attrname='val')
+    # paragraph spacing
+    spacing_properties = XmlChild(type=ParagraphSpacing)
+
     @property
     def start_margin_position(self):
         # Regarding indentation,
@@ -51,3 +57,16 @@ def to_int(self, attribute, default=None):
             return int(getattr(self, attribute, default))
         except (ValueError, TypeError):
             return default
+
+    @property
+    def is_list_paragraph(self):
+        return self.parent_style == 'ListParagraph'
+
+    @property
+    def no_indentation(self):
+        return not any((
+            self.indentation_left,
+            self.indentation_hanging,
+            self.indentation_right,
+            self.indentation_first_line,
+        ))
diff --git a/pydocx/openxml/wordprocessing/paragraph_spacing.py b/pydocx/openxml/wordprocessing/paragraph_spacing.py
new file mode 100644
index 00000000..6912bdd3
--- /dev/null
+++ b/pydocx/openxml/wordprocessing/paragraph_spacing.py
@@ -0,0 +1,27 @@
+# coding: utf-8
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+)
+
+from pydocx.models import XmlModel, XmlAttribute
+from pydocx.types import OnOff
+
+
+class ParagraphSpacing(XmlModel):
+    XML_TAG = 'spacing'
+
+    after = XmlAttribute(name='after')
+    before = XmlAttribute(name='before')
+    line = XmlAttribute(name='line')
+    line_rule = XmlAttribute(name='lineRule')
+    after_auto_spacing = XmlAttribute(type=OnOff, name='afterAutospacing')
+
+    def to_int(self, attribute, default=None):
+        # TODO would be nice if this integer conversion was handled
+        # implicitly by the model somehow
+        try:
+            return int(getattr(self, attribute, default))
+        except (ValueError, TypeError):
+            return default
diff --git a/pydocx/openxml/wordprocessing/run.py b/pydocx/openxml/wordprocessing/run.py
index 2acdb944..3095ce54 100644
--- a/pydocx/openxml/wordprocessing/run.py
+++ b/pydocx/openxml/wordprocessing/run.py
@@ -46,12 +46,9 @@ class Run(XmlModel):
     )
 
     def get_style_chain_stack(self):
-        if not self.properties:
-            return
-
-        parent_style = self.properties.parent_style
-        if not parent_style:
-            return
+        # Even if parent style is not defined we still need to check the default style
+        # properties applied
+        parent_style = getattr(self.properties, 'parent_style', None)
 
         # TODO the getattr is necessary because of footnotes. From the context
         # of a footnote, a paragraph's container is the footnote part, which
@@ -90,6 +87,11 @@ def _get_inherited_properties_from_parent_style(self):
     @property
     def inherited_properties(self):
         properties = {}
+        if self.default_doc_styles and getattr(self.default_doc_styles.run, 'properties'):
+            properties.update(
+                dict(self.default_doc_styles.run.properties.fields),
+            )
+
         properties.update(
             self._get_properties_inherited_from_parent_paragraph(),
         )
diff --git a/pydocx/openxml/wordprocessing/style.py b/pydocx/openxml/wordprocessing/style.py
index 2092d30c..feefe0c6 100644
--- a/pydocx/openxml/wordprocessing/style.py
+++ b/pydocx/openxml/wordprocessing/style.py
@@ -5,17 +5,21 @@
     unicode_literals,
 )
 
+from pydocx.types import OnOff
 from pydocx.models import XmlModel, XmlChild, XmlAttribute
 from pydocx.openxml.wordprocessing.run_properties import RunProperties
+from pydocx.openxml.wordprocessing.paragraph_properties import ParagraphProperties
 
 
 class Style(XmlModel):
     XML_TAG = 'style'
 
     style_type = XmlAttribute(name='type', default='paragraph')
+    style_default = XmlAttribute(type=OnOff, name='default', default='0')
     style_id = XmlAttribute(name='styleId', default='')
     name = XmlChild(attrname='val', default='')
     run_properties = XmlChild(type=RunProperties)
+    paragraph_properties = XmlChild(type=ParagraphProperties)
     parent_style = XmlChild(name='basedOn', attrname='val')
 
     def is_a_heading(self):
diff --git a/pydocx/openxml/wordprocessing/styles.py b/pydocx/openxml/wordprocessing/styles.py
index 46bf6287..c9acf7a7 100644
--- a/pydocx/openxml/wordprocessing/styles.py
+++ b/pydocx/openxml/wordprocessing/styles.py
@@ -7,22 +7,31 @@
 
 from collections import defaultdict
 
-from pydocx.models import XmlCollection, XmlModel
+from pydocx.models import XmlCollection, XmlModel, XmlChild
 from pydocx.openxml.wordprocessing.style import Style
+from pydocx.openxml.wordprocessing.doc_defaults import DocDefaults
 
 
 class Styles(XmlModel):
     XML_TAG = 'styles'
 
     styles = XmlCollection(Style)
+    doc_defaults = XmlChild(type=DocDefaults)
 
     def __init__(self, styles=None, *args, **kwargs):
         super(Styles, self).__init__(styles=styles, *args, **kwargs)
 
         styles_by_type = defaultdict(dict)
+        default_styles_by_type = defaultdict(dict)
         for style in self.styles:
             styles_by_type[style.style_type][style.style_id] = style
+            if bool(style.style_default):
+                default_styles_by_type[style.style_type][style.style_id] = style
         self.styles_by_type = dict(styles_by_type)
+        self.default_styles_by_type = dict(default_styles_by_type)
 
     def get_styles_by_type(self, style_type):
         return self.styles_by_type.get(style_type, {})
+
+    def get_default_styles_by_type(self, style_type):
+        return self.default_styles_by_type.get(style_type, {})
diff --git a/pydocx/openxml/wordprocessing/table.py b/pydocx/openxml/wordprocessing/table.py
index 61314b29..cea35b9b 100644
--- a/pydocx/openxml/wordprocessing/table.py
+++ b/pydocx/openxml/wordprocessing/table.py
@@ -7,13 +7,16 @@
 
 from collections import defaultdict
 
-from pydocx.models import XmlModel, XmlCollection
+from pydocx.models import XmlModel, XmlCollection, XmlChild
 from pydocx.openxml.wordprocessing.table_row import TableRow
+from pydocx.openxml.wordprocessing.table_properties import TableProperties
 
 
 class Table(XmlModel):
     XML_TAG = 'tbl'
 
+    properties = XmlChild(type=TableProperties)
+
     rows = XmlCollection(
         TableRow,
     )
@@ -45,3 +48,14 @@ def calculate_table_cell_spans(self):
                         if active_rowspan_for_column:
                             cell_to_rowspan_count[active_rowspan_for_column] += 1  # noqa
         return dict(cell_to_rowspan_count)
+
+    def get_style_chain_stack(self):
+        # Even if parent style is not defined we still need to check the default style
+        # properties applied
+        parent_style = getattr(self.properties, 'parent_style', None)
+
+        part = getattr(self.container, 'style_definitions_part', None)
+        if part:
+            style_stack = part.get_style_chain_stack('table', parent_style)
+            for result in style_stack:
+                yield result
diff --git a/pydocx/openxml/wordprocessing/table_cell.py b/pydocx/openxml/wordprocessing/table_cell.py
index 8a538e86..309a8c2c 100644
--- a/pydocx/openxml/wordprocessing/table_cell.py
+++ b/pydocx/openxml/wordprocessing/table_cell.py
@@ -6,7 +6,6 @@
 )
 
 from pydocx.models import XmlModel, XmlCollection, XmlChild
-from pydocx.openxml.wordprocessing.paragraph import Paragraph
 from pydocx.openxml.wordprocessing.table_cell_properties import TableCellProperties  # noqa
 
 
@@ -16,6 +15,14 @@ class TableCell(XmlModel):
     properties = XmlChild(type=TableCellProperties)
 
     children = XmlCollection(
-        Paragraph,
+        'wordprocessing.Paragraph',
         'wordprocessing.Table',
     )
+
+    @property
+    def parent_table(self):
+        return self.parent.parent
+
+    @property
+    def table_properties(self):
+        return self.parent_table.properties
diff --git a/pydocx/openxml/wordprocessing/table_cell_properties.py b/pydocx/openxml/wordprocessing/table_cell_properties.py
index 2a94c9b0..7ae94c31 100644
--- a/pydocx/openxml/wordprocessing/table_cell_properties.py
+++ b/pydocx/openxml/wordprocessing/table_cell_properties.py
@@ -21,7 +21,11 @@ def should_close_previous_vertical_merge(self):
         # of preceding cells shall be closed.
         if self.vertical_merge is None:
             return True
+        return not self.is_continue_vertical_merge
+
+    @property
+    def is_continue_vertical_merge(self):
+        if self.vertical_merge is None:
+            return False
         merge = self.vertical_merge.get('val', 'continue')
-        if merge != 'continue':
-            return True
-        return False
+        return merge == 'continue'
diff --git a/pydocx/openxml/wordprocessing/table_properties.py b/pydocx/openxml/wordprocessing/table_properties.py
new file mode 100644
index 00000000..76b005d2
--- /dev/null
+++ b/pydocx/openxml/wordprocessing/table_properties.py
@@ -0,0 +1,14 @@
+# coding: utf-8
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+)
+
+from pydocx.models import XmlModel, XmlChild
+
+
+class TableProperties(XmlModel):
+    XML_TAG = 'tblPr'
+
+    parent_style = XmlChild(name='tblStyle', attrname='val')
diff --git a/pydocx/test/testcases.py b/pydocx/test/testcases.py
index 50e144c1..0024367a 100644
--- a/pydocx/test/testcases.py
+++ b/pydocx/test/testcases.py
@@ -50,6 +50,9 @@
     '.pydocx-tab {display:inline-block;width:4em}'
     '.pydocx-underline {text-decoration:underline}'
     'body {margin:0px auto;width:51.00em}'
+    'ol {margin-bottom:0;margin-top:0}'
+    'p {margin-bottom:0;margin-top:0}'
+    'ul {margin-bottom:0;margin-top:0}'
     '</style>'
 )
 
diff --git a/pydocx/types.py b/pydocx/types.py
index 722024ab..327008c0 100644
--- a/pydocx/types.py
+++ b/pydocx/types.py
@@ -12,6 +12,12 @@ def __init__(self, value):
     def __bool__(self):
         return self.__nonzero__()
 
+    def __repr__(self):
+        return '{klass}({kwargs})'.format(
+            klass=self.__class__.__name__,
+            kwargs=bool(self)
+        )
+
 
 class OnOff(SimpleType):
     '''
diff --git a/tests/export/html/test_field_code.py b/tests/export/html/test_field_code.py
index 77033818..274e011c 100644
--- a/tests/export/html/test_field_code.py
+++ b/tests/export/html/test_field_code.py
@@ -206,6 +206,7 @@ def test_spanning_multiple_paragraphs(self):
 
         expected_html = '''
             <p>Link: </p>
+            <p></p>
             <p><a href="http://www.google.com/">AAABBB</a></p>
             <p><a href="http://www.google.com/">CCC</a></p>
             <p><a href="http://www.google.com/">DDD</a>.</p>
diff --git a/tests/export/html/test_heading.py b/tests/export/html/test_heading.py
index b77dfc2d..f50176cb 100644
--- a/tests/export/html/test_heading.py
+++ b/tests/export/html/test_heading.py
@@ -274,7 +274,7 @@ def test_heading_in_a_nested_list_numbering_is_preserved_with_strong(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                 <li>
-                    foo
+                    <p>foo</p>
                     <ol class="pydocx-list-style-type-lowerLetter">
                         <li>
                             <strong>bar</strong>
@@ -351,10 +351,10 @@ def test_heading_in_nested_sub_list(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                     <li>
-                            foo
-                            <ol class="pydocx-list-style-type-lowerLetter">
-                                    <li>bar</li>
-                            </ol>
+                        <p>foo</p>
+                        <ol class="pydocx-list-style-type-lowerLetter">
+                                <li><p>bar</p></li>
+                        </ol>
                     </li>
             </ol>
             <h1>baz</h1>
@@ -416,8 +416,7 @@ def test_headings_in_list_surrounding_paragraph_stay_in_list_with_strong(self):
             <ol class="pydocx-list-style-type-decimal">
                 <li>
                     <strong>foo</strong>
-                    <br />
-                    bare paragraph
+                    <p>bare paragraph</p>
                 </li>
                 <li>
                     <strong>bar</strong>
@@ -527,7 +526,7 @@ def test_heading_as_new_list_following_bare_paragraph_plus_list(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>foo</li>
+                <li><p>foo</p></li>
             </ol>
             <p>bare paragraph</p>
             <ol class="pydocx-list-style-type-decimal">
@@ -588,7 +587,10 @@ def test_heading_as_list_following_bare_paragraph_plus_list(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>foo<br />bare paragraph</li>
+                <li>
+                    <p>foo</p>
+                    <p>bare paragraph</p>
+                </li>
                 <li><strong>bar</strong></li>
             </ol>
         '''
@@ -662,13 +664,13 @@ def test_list_heading_table_paragraph(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>single list item</li>
+                <li><p>single list item</p></li>
             </ol>
             <h1>actual heading</h1>
             <p>before table</p>
             <table border="1">
                 <tr>
-                    <td>foo</td>
+                    <td><p>foo</p></td>
                 </tr>
             </table>
             <p>after table</p>
@@ -739,7 +741,7 @@ def test_single_lvl_list_has_precedence_over_headings(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                 <li><strong>foo</strong></li>
-                <li>non-heading list item</li>
+                <li><p>non-heading list item</p></li>
                 <li><strong>bar</strong></li>
             </ol>
         '''
diff --git a/tests/export/html/test_hyperlink.py b/tests/export/html/test_hyperlink.py
index dbbe4a0c..b8bc3887 100644
--- a/tests/export/html/test_hyperlink.py
+++ b/tests/export/html/test_hyperlink.py
@@ -86,7 +86,7 @@ def test_no_link_text(self):
 
         document.add(MainDocumentPart, document_xml, document_rels)
 
-        expected_html = ''
+        expected_html = '<p>&#160;</p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_undefined_relationship(self):
diff --git a/tests/export/html/test_markup_compatibility.py b/tests/export/html/test_markup_compatibility.py
index 6b89dc25..47efcce5 100644
--- a/tests/export/html/test_markup_compatibility.py
+++ b/tests/export/html/test_markup_compatibility.py
@@ -155,7 +155,9 @@ def test_fallback_contains_a_table(self):
             <p>AAABBB</p>
             <table border="1">
                 <tr>
-                    <td>CCC</td>
+                    <td>
+                        <p>CCC</p>
+                    </td>
                 </tr>
             </table>
             <p>DDDEEE</p>
@@ -204,7 +206,9 @@ def test_fallback_has_invalid_children(self):
             <p>AAABBB
                 <table border="1">
                     <tr>
-                        <td>CCC</td>
+                        <td>
+                            <p>CCC</p>
+                        </td>
                     </tr>
                 </table>
             DDDEEE</p>
diff --git a/tests/export/html/test_numbering.py b/tests/export/html/test_numbering.py
index b41dc9de..d567972c 100644
--- a/tests/export/html/test_numbering.py
+++ b/tests/export/html/test_numbering.py
@@ -78,7 +78,9 @@ def test_lowerLetter_numbering_format_is_handled(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
+                <li>
+                    <p>AAA</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -115,8 +117,12 @@ def test_single_level_list_with_surrounding_paragraphs(self):
         expected_html = '''
             <p>Foo</p>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
-                <li>BBB</li>
+                <li>
+                    <p>AAA</p>
+                </li>
+                <li>
+                    <p>BBB</p>
+                </li>
             </ol>
             <p>Bar</p>
         '''
@@ -172,11 +178,15 @@ def test_multi_level_list_with_surrounding_paragraphs(self):
         expected_html = '''
             <p>Foo</p>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA
+                <li>
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>BBB
+                        <li>
+                            <p>BBB</p>
                             <ol class="pydocx-list-style-type-upperLetter">
-                                <li>CCC</li>
+                                <li>
+                                    <p>CCC</p>
+                                </li>
                             </ol>
                         </li>
                     </ol>
@@ -226,10 +236,14 @@ def test_adjacent_lists(self):
         expected_html = '''
             <p>Foo</p>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
+                <li>
+                    <p>AAA</p>
+                </li>
             </ol>
             <ol class="pydocx-list-style-type-decimal">
-                <li>BBB</li>
+                <li>
+                    <p>BBB</p>
+                </li>
             </ol>
             <p>Bar</p>
         '''
@@ -293,7 +307,9 @@ def test_basic_list_followed_by_list_that_is_heading_and_paragraph(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
+                <li>
+                    <p>AAA</p>
+                </li>
             </ol>
             <ol class="pydocx-list-style-type-decimal">
                 <li>
@@ -345,11 +361,11 @@ def test_separate_lists_with_paragraph_in_between_and_after(self):
         expected_html = '''
             <p>Foo</p>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
+                <li><p>AAA</p></li>
             </ol>
             <p>Bar</p>
             <ol class="pydocx-list-style-type-decimal">
-                <li>BBB</li>
+                <li><p>BBB</p></li>
             </ol>
             <p>Baz</p>
         '''
@@ -382,7 +398,7 @@ def test_single_list_followed_by_paragraph(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
+                <li><p>AAA</p></li>
             </ol>
             <p>Foo</p>
         '''
@@ -421,8 +437,11 @@ def test_single_list_with_bare_paragraph_between_items(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA<br />Foo</li>
-                <li>BBB</li>
+                <li>
+                    <p>AAA</p>
+                    <p>Foo</p>
+                </li>
+                <li><p>BBB</p></li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -545,7 +564,7 @@ def test_paragraph_with_valid_list_level_followed_by_missing_level(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
+                <li><p>AAA</p></li>
             </ol>
             <p>foo</p>
         '''
@@ -592,11 +611,12 @@ def test_missing_level_in_between_valid_levels(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
                 <li>
-                    AAA
-                    <br />
-                    foo
+                    <p>AAA</p>
+                    <p>foo</p>
+                </li>
+                <li>
+                    <p>BBB</p>
                 </li>
-                <li>BBB</li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -628,8 +648,11 @@ def test_empty_paragraph_after_list_item(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
+                <li>
+                    <p>AAA</p>
+                </li>
             </ol>
+            <p>&#160;</p>
         '''
         self.assert_document_generates_html(document, expected_html)
 
@@ -666,8 +689,13 @@ def test_empty_paragraph_in_between_list_items(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
-                <li>BBB</li>
+                <li>
+                    <p>AAA</p>
+                    <p>&#160;</p>
+                </li>
+                <li>
+                    <p>BBB</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -707,8 +735,13 @@ def test_paragraph_and_run_with_empty_text_in_between_list_items(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
-                <li>BBB</li>
+                <li>
+                    <p>AAA</p>
+                    <p></p>
+                </li>
+                <li>
+                    <p>BBB</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -748,8 +781,13 @@ def test_paragraph_with_empty_run_in_between_list_items(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
-                <li>BBB</li>
+                <li>
+                    <p>AAA</p>
+                    <p>&#160;</p>
+                </li>
+                <li>
+                    <p>BBB</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -792,8 +830,14 @@ def test_paragraph_with_empty_run_followed_by_non_empty_paragraph(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA<br />BBB</li>
-                <li>CCC</li>
+                <li>
+                    <p>AAA</p>
+                    <p>&#160;</p>
+                    <p>BBB</p>
+                </li>
+                <li>
+                    <p>CCC</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -842,8 +886,16 @@ def test_paragraph_with_multiple_empty_runs_followed_by_non_empty_paragraph(self
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA<br />BBB</li>
-                <li>CCC</li>
+                <li>
+                    <p>AAA</p>
+                    <p>&#160;</p>
+                    <p>&#160;</p>
+                    <p>&#160;</p>
+                    <p>BBB</p>
+                </li>
+                <li>
+                    <p>CCC</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -892,8 +944,16 @@ def test_paragraph_empty_run_paragraph_empty_run_paragraph(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA<br />Foo<br />Bar</li>
-                <li>CCC</li>
+                <li>
+                    <p>AAA</p>
+                    <p>&#160;</p>
+                    <p>Foo</p>
+                    <p>&#160;</p>
+                    <p>Bar</p>
+                </li>
+                <li>
+                    <p>CCC</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -933,8 +993,13 @@ def test_paragraph_followed_by_paragraph_with_only_whitespace(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>AAA</li>
-                <li>BBB</li>
+                <li>
+                    <p>AAA</p>
+                    <p> </p>
+                </li>
+                <li>
+                    <p>BBB</p>
+                </li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -965,7 +1030,7 @@ def test_empty_item(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li></li>
+                <li><p></p></li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -1058,13 +1123,13 @@ def test_numfmt_None_causes_sub_list_to_be_ignored(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                 <li>
-                    AAA
-                    <br />
-                    BBB
-                    <br />
-                    CCC
+                    <p>AAA</p>
+                    <p>BBB</p>
+                    <p>CCC</p>
+                </li>
+                <li>
+                    <p>DDD</p>
                 </li>
-                <li>DDD</li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -1119,8 +1184,8 @@ def test_root_level_numfmt_None_with_sublist(self):
         expected_html = '''
             <p>AAA</p>
             <ol class="pydocx-list-style-type-decimal">
-                <li>BBB</li>
-                <li>CCC</li>
+                <li><p>BBB</p></li>
+                <li><p>CCC</p></li>
             </ol>
             <p>DDD</p>
         '''
@@ -1216,11 +1281,15 @@ def test_default_indentation(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>AAA
+                <li>
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>BBB
+                        <li>
+                            <p>BBB</p>
                             <ol class="pydocx-list-style-type-decimal">
-                                <li>CCC</li>
+                                <li>
+                                    <p>CCC</p>
+                                </li>
                             </ol>
                         </li>
                     </ol>
@@ -1287,11 +1356,15 @@ def test_custom_indentation(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li style="margin-left:3.00em">AAA
+                <li style="margin-left:3.00em">
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li style="margin-left:3.00em">BBB
+                        <li style="margin-left:3.00em">
+                            <p>BBB</p>
                             <ol class="pydocx-list-style-type-decimal">
-                                <li style="margin-left:3.00em">CCC</li>
+                                <li style="margin-left:3.00em">
+                                    <p>CCC</p>
+                                </li>
                             </ol>
                         </li>
                     </ol>
@@ -1359,14 +1432,13 @@ def test_custom_hanging_indentation(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                 <li style="margin-left:-0.58em">
-                    <span style="display:inline-block;text-indent:0.58em">AAA</span>
+                    <p style="text-indent:0.58em">AAA</p>
                     <ol class="pydocx-list-style-type-decimal">
                         <li style="margin-left:-1.42em">
-                            <span style="display:inline-block;text-indent:1.42em">BBB</span>
+                            <p style="text-indent:1.42em">BBB</p>
                             <ol class="pydocx-list-style-type-decimal">
                                 <li style="margin-left:-1.83em">
-                                    <span style="display:inline-block;text-indent:1.83em">CCC
-                                    </span>
+                                    <p style="text-indent:1.83em">CCC</p>
                                 </li>
                             </ol>
                         </li>
@@ -1434,11 +1506,13 @@ def test_custom_first_line_indentation(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li style="margin-left:1.50em">AAA
+                <li style="margin-left:1.50em">
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>BBB
+                        <li>
+                            <p>BBB</p>
                             <ol class="pydocx-list-style-type-decimal">
-                                <li>CCC</li>
+                                <li><p>CCC</p></li>
                             </ol>
                         </li>
                     </ol>
@@ -1520,15 +1594,19 @@ def test_nested_separated_lists(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
             <li>
-                AAA
+                <p>AAA</p>
                 <ol class="pydocx-list-style-type-decimal">
                     <li>
-                        BBB
+                        <p>BBB</p>
                         <ol class="pydocx-list-style-type-lowerLetter">
-                            <li style="margin-left:3.00em">CCC</li>
+                            <li style="margin-left:3.00em">
+                                <p>CCC</p>
+                            </li>
                         </ol>
                     </li>
-                    <li>DDD</li>
+                    <li>
+                        <p>DDD</p>
+                    </li>
                 </ol>
             </li>
         </ol>
@@ -1602,13 +1680,17 @@ def test_nested_separated_lists_different_level(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                 <li>
-                    AAA
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-lowerLetter">
-                        <li>BBB</li>
-                        <li>CCC</li>
+                        <li>
+                            <p>BBB</p>
+                        </li>
+                        <li>
+                            <p>CCC</p>
+                        </li>
                     </ol>
                 </li>
-                <li>DDD</li>
+                <li><p>DDD</p></li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -1632,7 +1714,7 @@ def assert_html(self, list_type, digit_generator):
         document_xml = ''.join(paragraphs)
 
         items = [
-            '<li>{item}</li>'.format(item=item)
+            '<li><p>{item}</p></li>'.format(item=item)
             for item in expected_items
         ]
 
@@ -1707,9 +1789,9 @@ def test_real_list_plus_fake_list(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>Foo</li>
-                <li>Bar</li>
-                <li>Baz</li>
+                <li><p>Foo</p></li>
+                <li><p>Bar</p></li>
+                <li><p>Baz</p></li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -1745,10 +1827,11 @@ def test_real_list_plus_tab_nested_fake_list_with_mixed_formats(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>AAA
+                <li>
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-lowerLetter">
-                        <li>BBB</li>
-                        <li>CCC</li>
+                        <li><p>BBB</p></li>
+                        <li><p>CCC</p></li>
                     </ol>
                 </li>
             </ol>
@@ -1788,9 +1871,9 @@ def test_initial_faked_list_plus_real_list(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>Foo</li>
-                <li>Bar</li>
-                <li>AAA</li>
+                <li><p>Foo</p></li>
+                <li><p>Bar</p></li>
+                <li><p>AAA</p></li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -1805,12 +1888,12 @@ def test_one_fake_list_followed_by_another_fake_list_same_format(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>AA</li>
-                <li>AB</li>
+                <li><p>AA</p></li>
+                <li><p>AB</p></li>
             </ol>
             <ol class="pydocx-list-style-type-decimal">
-                <li>BA</li>
-                <li>BB</li>
+                <li><p>BA</p></li>
+                <li><p>BB</p></li>
             </ol>
         '''
 
@@ -1826,12 +1909,12 @@ def test_one_fake_list_followed_by_another_fake_list_different_format(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>AA</li>
-                <li>AB</li>
+                <li><p>AA</p></li>
+                <li><p>AB</p></li>
             </ol>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>BA</li>
-                <li>BB</li>
+                <li><p>BA</p></li>
+                <li><p>BB</p></li>
             </ol>
         '''
 
@@ -1886,10 +1969,11 @@ def test_real_nested_list_continuation_fake_nested_list_using_indentation(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li style="margin-left:1.50em">AAA
+                <li style="margin-left:1.50em">
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>BBB</li>
-                        <li>CCC</li>
+                        <li><p>BBB</p></li>
+                        <li><p style="margin-left:-3.00em">CCC</p></li>
                     </ol>
                 </li>
             </ol>
@@ -1945,12 +2029,13 @@ def test_real_nested_list_continuation_fake_list_using_indentation(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li style="margin-left:1.50em">AAA
+                <li style="margin-left:1.50em">
+                    <p>AAA</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>BBB</li>
+                        <li><p>BBB</p></li>
                     </ol>
                 </li>
-                <li>CCC</li>
+                <li><p style="margin-left:-3.00em">CCC</p></li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -1993,19 +2078,21 @@ def test_faked_list_using_indentation(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>AA
+                <li>
+                    <p>AA</p>
                     <ol class="pydocx-list-style-type-lowerLetter">
-                        <li>AAA</li>
-                        <li>AAB</li>
-                        <li>AAC
+                        <li><p>AAA</p></li>
+                        <li><p>AAB</p></li>
+                        <li>
+                            <p>AAC</p>
                             <ol class="pydocx-list-style-type-upperLetter">
-                                <li>AACA</li>
+                                <li><p>AACA</p></li>
                             </ol>
                         </li>
-                        <li>AAD</li>
+                        <li><p>AAD</p></li>
                     </ol>
                 </li>
-                <li>AB</li>
+                <li><p>AB</p></li>
             </ol>
         '''
 
@@ -2020,8 +2107,8 @@ def test_faked_list_that_skips_numbers(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>AA</li>
-                <li>AB</li>
+                <li><p>AA</p></li>
+                <li><p>AB</p></li>
             </ol>
             <p>
                 4. AC
@@ -2065,8 +2152,8 @@ def test_space_after_dot_followed_by_number_is_converted(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>1</li>
-                <li>2</li>
+                <li><p>1</p></li>
+                <li><p>2</p></li>
             </ol>
         '''
 
@@ -2102,19 +2189,19 @@ def test_tab_char_is_sufficient_for_space_after_dot(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>a</li>
+                <li><p>a</p></li>
             </ol>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>b</li>
+                <li><p>b</p></li>
             </ol>
             <ol class="pydocx-list-style-type-upperLetter">
-                <li>c</li>
+                <li><p>c</p></li>
             </ol>
             <ol class="pydocx-list-style-type-upperRoman">
-                <li>d</li>
+                <li><p>d</p></li>
             </ol>
             <ol class="pydocx-list-style-type-lowerRoman">
-                <li>e</li>
+                <li><p>e</p></li>
             </ol>
         '''
 
@@ -2131,19 +2218,19 @@ def test_single_item_lists(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>a</li>
+                <li><p>a</p></li>
             </ol>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>b</li>
+                <li><p>b</p></li>
             </ol>
             <ol class="pydocx-list-style-type-upperLetter">
-                <li>c</li>
+                <li><p>c</p></li>
             </ol>
             <ol class="pydocx-list-style-type-upperRoman">
-                <li>d</li>
+                <li><p>d</p></li>
             </ol>
             <ol class="pydocx-list-style-type-lowerRoman">
-                <li>e</li>
+                <li><p>e</p></li>
             </ol>
         '''
 
@@ -2162,7 +2249,7 @@ def test_trailing_text_is_not_removed(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>Foo Bar</li>
+                <li><p>Foo Bar</p></li>
             </ol>
         '''
 
@@ -2181,7 +2268,7 @@ def test_leading_text_is_not_removed(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>Foo Bar</li>
+                <li><p>Foo Bar</p></li>
             </ol>
         '''
 
@@ -2221,8 +2308,8 @@ def test_faked_list_with_list_level_numfmt_None_still_detected(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>AAA</li>
-                <li>BBB</li>
+                <li><p>AAA</p></li>
+                <li><p>BBB</p></li>
             </ol>
         '''
         self.assert_document_generates_html(document, expected_html)
@@ -2252,8 +2339,8 @@ def test_faked_within_a_table(self):
                 <tr>
                     <td>
                         <ol class="pydocx-list-style-type-decimal">
-                            <li>Foo</li>
-                            <li>Bar</li>
+                            <li><p>Foo</p></li>
+                            <li><p>Bar</p></li>
                         </ol>
                     </td>
                 </tr>
@@ -2396,14 +2483,15 @@ def setUp(self):
 
         self.expected_html = '''
             <ol class="pydocx-list-style-type-{0}">
-                <li></li>
+                <li><p></p></li>
                 <li>
+                    <p></p>
                     <ol class="pydocx-list-style-type-{1}">
-                        <li></li>
-                        <li></li>
+                        <li><p></p></li>
+                        <li><p></p></li>
                     </ol>
                 </li>
-                <li></li>
+                <li><p></p></li>
             </ol>
         '''
 
@@ -2488,21 +2576,27 @@ def setUp(self):
 
         self.expected_html = '''
             <ol class="pydocx-list-style-type-{0}">
-                <li>AA</li>
-                <li>AB
+                <li>
+                    <p>AA</p>
+                </li>
+                <li>
+                    <p>AB</p>
                     <ol class="pydocx-list-style-type-{1}">
-                        <li>ABA</li>
-                        <li>ABB
+                        <li>
+                            <p>ABA</p>
+                        </li>
+                        <li>
+                            <p>ABB</p>
                             <ol class="pydocx-list-style-type-{2}">
-                                <li>ABBA</li>
-                                <li>ABBB</li>
-                                <li>ABBC</li>
+                                <li><p>ABBA</p></li>
+                                <li><p>ABBB</p></li>
+                                <li><p>ABBC</p></li>
                             </ol>
                         </li>
-                        <li>ABC</li>
+                        <li><p>ABC</p></li>
                     </ol>
                 </li>
-                <li>AC</li>
+                <li><p>AC</p></li>
             </ol>
         '''
 
diff --git a/tests/export/html/test_paragraph.py b/tests/export/html/test_paragraph.py
index 4cda50d5..e2faa5da 100644
--- a/tests/export/html/test_paragraph.py
+++ b/tests/export/html/test_paragraph.py
@@ -17,7 +17,7 @@ def test_no_runs_no_text(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p>&#160;</p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_multiple_runs_with_only_whitespace(self):
@@ -34,7 +34,7 @@ def test_multiple_runs_with_only_whitespace(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p>  </p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_run_with_only_whitespace_styled(self):
@@ -51,7 +51,7 @@ def test_run_with_only_whitespace_styled(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p> </p>'
         self.assert_document_generates_html(document, expected_html)
 
 
@@ -154,7 +154,7 @@ def test_single_whitespace_in_text_run_is_preserved(self):
         expected_html = '<p>Foo Bar</p>'
         self.assert_document_generates_html(document, expected_html)
 
-    def test_paragraph_with_only_whitespace_is_ignored(self):
+    def test_paragraph_with_only_whitespace_is_not_ignored(self):
         document_xml = '''
             <p>
               <r>
@@ -168,7 +168,7 @@ def test_paragraph_with_only_whitespace_is_ignored(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p>  </p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_leading_whitespace_is_preserved(self):
@@ -205,7 +205,7 @@ def test_multiple_text_tags_in_a_single_run_tag_create_single_paragraph(
         expected_html = '<p>ABC</p>'
         self.assert_document_generates_html(document, expected_html)
 
-    def test_empty_text_tag_does_not_create_paragraph(self):
+    def test_empty_text_tag_does_create_paragraph(self):
         document_xml = '''
             <p>
               <r>
@@ -216,7 +216,7 @@ def test_empty_text_tag_does_not_create_paragraph(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p></p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_unicode_character_from_xml_entity(self):
@@ -301,7 +301,7 @@ def test_nested_smartTag(self):
 
 
 class ParagraphJustificationTestCase(DocumentGeneratorTestCase):
-    def test_with_empty_text_does_not_render_paragraph(self):
+    def test_with_empty_text_does_render_paragraph(self):
         document_xml = '''
             <p>
               <pPr>
@@ -316,10 +316,10 @@ def test_with_empty_text_does_not_render_paragraph(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p class="pydocx-center"></p>'
         self.assert_document_generates_html(document, expected_html)
 
-    def test_with_missing_text_does_not_render_paragraph(self):
+    def test_with_missing_text_does_render_paragraph(self):
         document_xml = '''
             <p>
               <pPr>
@@ -332,7 +332,7 @@ def test_with_missing_text_does_not_render_paragraph(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p class="pydocx-center">&#160;</p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_with_blank_space_in_text_does_not_render_paragraph_with_span(self):  # noqa
@@ -350,7 +350,7 @@ def test_with_blank_space_in_text_does_not_render_paragraph_with_span(self):  #
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p class="pydocx-center"> </p>'
         self.assert_document_generates_html(document, expected_html)
 
 
@@ -363,7 +363,7 @@ def get_break_tag(self, br):
 class IgnoringBreakTagTestCase(DocumentGeneratorTestCase):
     exporter = IgnoringBreakTagExporter
 
-    def test_break_tag_by_itself_yields_no_output(self):
+    def test_break_tag_by_itself_yields_only_paragraph(self):
         document_xml = '''
             <p>
               <r>
@@ -375,7 +375,7 @@ def test_break_tag_by_itself_yields_no_output(self):
         document = WordprocessingDocumentFactory()
         document.add(MainDocumentPart, document_xml)
 
-        expected_html = ''
+        expected_html = '<p></p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_break_tag_with_text_break_tag_is_ignored(self):
diff --git a/tests/export/html/test_tables.py b/tests/export/html/test_tables.py
index 6ee5ebba..b5590270 100644
--- a/tests/export/html/test_tables.py
+++ b/tests/export/html/test_tables.py
@@ -33,7 +33,7 @@ def test_one_row_one_cell_one_paragraph(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td><p>Foo</p></td>
                 </tr>
             </table>
         '''
@@ -65,7 +65,10 @@ def test_one_row_one_cell_multiple_paragraphs(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo<br />Bar</td>
+                    <td>
+                        <p>Foo</p>
+                        <p>Bar</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -115,12 +118,12 @@ def test_two_rows_two_cells_one_paragraph_each(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
-                    <td>Bar</td>
+                    <td><p>Foo</p></td>
+                    <td><p>Bar</p></td>
                 </tr>
                 <tr>
-                    <td>One</td>
-                    <td>Two</td>
+                    <td><p>One</p></td>
+                    <td><p>Two</p></td>
                 </tr>
             </table>
         '''
@@ -173,7 +176,11 @@ def test_cell_with_character_styles_applied(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td><em><strong>Foo</strong></em></td>
+                    <td>
+                        <p>
+                            <em><strong>Foo</strong></em>
+                        </p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -219,11 +226,13 @@ def test_two_rows_two_cells_with_colspan(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td colspan="2">Foo</td>
+                    <td colspan="2">
+                        <p>Foo</p>
+                    </td>
                 </tr>
                 <tr>
-                    <td>One</td>
-                    <td>Two</td>
+                    <td><p>One</p></td>
+                    <td><p>Two</p></td>
                 </tr>
             </table>
         '''
@@ -274,11 +283,17 @@ def test_two_rows_two_cells_with_rowspan(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td rowspan="2">Foo</td>
-                    <td>Bar</td>
+                    <td rowspan="2">
+                        <p>Foo</p>
+                    </td>
+                    <td>
+                        <p>Bar</p>
+                    </td>
                 </tr>
                 <tr>
-                    <td>Two</td>
+                    <td>
+                        <p>Two</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -302,7 +317,9 @@ def test_one_row_one_cell_with_empty_paragraph(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td></td>
+                    <td>
+                        <p>&#160;</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -329,7 +346,10 @@ def test_one_row_one_cell_with_empty_paragraph_after_other_paragraph(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td>
+                        <p>Foo</p>
+                        <p>&#160;</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -356,7 +376,10 @@ def test_one_row_one_cell_with_empty_paragraph_before_other_paragraph(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td>
+                        <p>&#160;</p>
+                        <p>Foo</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -384,7 +407,10 @@ def test_one_row_one_cell_with_paragraph_that_has_empty_run_before_other_paragra
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td>
+                        <p>&#160;</p>
+                        <p>Foo</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -412,7 +438,10 @@ def test_one_row_one_cell_with_paragraph_that_has_empty_run_after_other_paragrap
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td>
+                        <p>Foo</p>
+                        <p>&#160;</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -440,7 +469,10 @@ def test_one_row_one_cell_with_empty_text_before_other_paragraph(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td>
+                        <p></p>
+                        <p>Foo</p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -468,7 +500,10 @@ def test_one_row_one_cell_with_empty_text_after_other_paragraph(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td>
+                        <p>Foo</p>
+                        <p></p>
+                    </td>
                 </tr>
             </table>
         '''
@@ -496,7 +531,10 @@ def test_one_row_one_cell_with_whitespace_after_other_paragraph(self):
         expected_html = '''
             <table border="1">
                 <tr>
-                    <td>Foo</td>
+                    <td>
+                        <p>Foo</p>
+                        <p> </p>
+                    </td>
                 </tr>
             </table>
         '''
diff --git a/tests/export/html/test_textbox.py b/tests/export/html/test_textbox.py
index 7ad847d1..923da46f 100644
--- a/tests/export/html/test_textbox.py
+++ b/tests/export/html/test_textbox.py
@@ -115,11 +115,15 @@ def test_textbox_with_a_table(self):
         document.add(MainDocumentPart, document_xml)
 
         expected_html = '''
-            <table border="1">
-                <tr>
-                    <td>AAA</td>
-                </tr>
-            </table>
+            <p>
+                <table border="1">
+                    <tr>
+                        <td>
+                            <p>AAA</p>
+                        </td>
+                    </tr>
+                </table>
+            </p>
         '''
         self.assert_document_generates_html(document, expected_html)
 
@@ -166,7 +170,9 @@ def test_textbox_with_a_table_and_other_runs(self):
                 AAA
                 <table border="1">
                     <tr>
-                        <td>BBB</td>
+                        <td>
+                            <p>BBB</p>
+                        </td>
                     </tr>
                 </table>
                 CCC
diff --git a/tests/export/test_docx.py b/tests/export/test_docx.py
index 16fa43d1..b74fbfce 100644
--- a/tests/export/test_docx.py
+++ b/tests/export/test_docx.py
@@ -33,6 +33,8 @@ class ConvertDocxToHtmlTestCase(DocXFixtureTestCaseFactory):
         'inline_tags',
         'justification',
         'paragraph_with_margins',
+        'paragraph_indentation_inside_lists',
+        'paragraph_spacing',
         'list_in_table',
         'lists_with_margins',
         'lists_with_styles',
diff --git a/tests/export/test_xml.py b/tests/export/test_xml.py
index 2ad17a88..22fd491a 100644
--- a/tests/export/test_xml.py
+++ b/tests/export/test_xml.py
@@ -131,12 +131,12 @@ class TableTag(TranslationTestCase):
     expected_output = '''
         <table border="1">
             <tr>
-                <td>AAA</td>
-                <td>BBB</td>
+                <td><p>AAA</p></td>
+                <td><p>BBB</p></td>
             </tr>
             <tr>
-                <td>CCC</td>
-                <td>DDD</td>
+                <td><p>CCC</p></td>
+                <td><p>DDD</p></td>
             </tr>
         </table>
     '''
@@ -158,11 +158,17 @@ class RowSpanTestCase(TranslationTestCase):
     expected_output = '''
            <table border="1">
             <tr>
-                <td rowspan="2">AAA</td>
-                <td>BBB</td>
+                <td rowspan="2">
+                    <p>AAA</p>
+                </td>
+                <td>
+                    <p>BBB</p>
+                </td>
             </tr>
             <tr>
-                <td>CCC</td>
+                <td>
+                    <p>CCC</p>
+                </td>
             </tr>
         </table>
     '''
@@ -185,20 +191,20 @@ class NestedTableTag(TranslationTestCase):
     expected_output = '''
         <table border="1">
             <tr>
-                <td>AAA</td>
-                <td>BBB</td>
+                <td><p>AAA</p></td>
+                <td><p>BBB</p></td>
             </tr>
             <tr>
-                <td>CCC</td>
+                <td><p>CCC</p></td>
                 <td>
                     <table border="1">
                         <tr>
-                            <td>DDD</td>
-                            <td>EEE</td>
+                            <td><p>DDD</p></td>
+                            <td><p>EEE</p></td>
                         </tr>
                         <tr>
-                            <td>FFF</td>
-                            <td>GGG</td>
+                            <td><p>FFF</p></td>
+                            <td><p>GGG</p></td>
                         </tr>
                     </table>
                 </td>
@@ -228,12 +234,12 @@ class TableWithInvalidTag(TranslationTestCase):
     expected_output = '''
         <table border="1">
             <tr>
-                <td>AAA</td>
-                <td>BBB</td>
+                <td><p>AAA</p></td>
+                <td><p>BBB</p></td>
             </tr>
             <tr>
                 <td></td>
-                <td>DDD</td>
+                <td><p>DDD</p></td>
             </tr>
         </table>
     '''
@@ -256,11 +262,11 @@ class TableWithListAndParagraph(TranslationTestCase):
             <tr>
                 <td>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>AAA</li>
-                        <li>BBB</li>
+                        <li><p>AAA</p></li>
+                        <li><p>BBB</p></li>
                     </ol>
-                    CCC<br />
-                    DDD
+                    <p>CCC</p>
+                    <p>DDD</p>
                 </td>
             </tr>
         </table>
@@ -299,9 +305,9 @@ def get_xml(self):
 class SimpleListTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-lowerLetter">
-            <li>AAA</li>
-            <li>BBB</li>
-            <li>CCC</li>
+            <li><p>AAA</p></li>
+            <li><p>BBB</p></li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -329,7 +335,7 @@ def get_xml(self):
 class SingleListItemTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-lowerLetter">
-            <li>AAA</li>
+            <li><p>AAA</p></li>
         </ol>
     '''
 
@@ -355,20 +361,24 @@ def get_xml(self):
 class ListWithContinuationTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
-            <li>AAA<br />BBB</li>
-            <li>CCC
+            <li>
+                <p>AAA</p>
+                <p>BBB</p>
+            </li>
+            <li>
+                <p>CCC</p>
                 <table border="1">
                     <tr>
-                        <td>DDD</td>
-                        <td>EEE</td>
+                        <td><p>DDD</p></td>
+                        <td><p>EEE</p></td>
                     </tr>
                     <tr>
-                        <td>FFF</td>
-                        <td>GGG</td>
+                        <td><p>FFF</p></td>
+                        <td><p>GGG</p></td>
                     </tr>
                 </table>
             </li>
-            <li>HHH</li>
+            <li><p>HHH</p></li>
         </ol>
     '''
 
@@ -397,19 +407,20 @@ def get_xml(self):
 class ListWithMultipleContinuationTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
-            <li>AAA
+            <li>
+                <p>AAA</p>
                 <table border="1">
                     <tr>
-                        <td>BBB</td>
+                        <td><p>BBB</p></td>
                     </tr>
                 </table>
                 <table border="1">
                     <tr>
-                        <td>CCC</td>
+                        <td><p>CCC</p></td>
                     </tr>
                 </table>
             </li>
-            <li>DDD</li>
+            <li><p>DDD</p></li>
         </ol>
     '''
 
@@ -437,13 +448,13 @@ def get_xml(self):
 class MangledIlvlTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-lowerLetter">
-            <li>AAA</li>
+            <li><p>AAA</p></li>
         </ol>
         <ol class="pydocx-list-style-type-decimal">
-            <li>BBB</li>
+            <li><p>BBB</p></li>
         </ol>
         <ol class="pydocx-list-style-type-decimal">
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -465,13 +476,13 @@ class SeperateListsIntoParentListTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-lowerLetter">
             <li>
-                AAA
+                <p>AAA</p>
                 <ol class="pydocx-list-style-type-decimal">
-                    <li>BBB</li>
-                    <li>CCC</li>
+                    <li><p>BBB</p></li>
+                    <li><p>CCC</p></li>
                 </ol>
             </li>
-            <li>DDD</li>
+            <li><p>DDD</p></li>
         </ol>
     '''
 
@@ -496,12 +507,13 @@ def get_xml(self):
 class InvalidIlvlOrderTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
-            <li>AAA
+            <li>
+                <p>AAA</p>
                 <ol class="pydocx-list-style-type-decimal">
-                    <li>BBB</li>
+                    <li><p>BBB</p></li>
                 </ol>
             </li>
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -617,7 +629,7 @@ def get_xml(self):
 
 
 class RTagWithNoText(TranslationTestCase):
-    expected_output = ''
+    expected_output = '<p>&#160;</p>'
 
     def get_xml(self):
         p_tag = DXB.p_tag(None)  # No text
@@ -634,11 +646,12 @@ class DeleteTagInList(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
             <li>
-                AAA
-                <br />
-                <span class="pydocx-delete">BBB</span>
+                <p>AAA</p>
+                <p>
+                    <span class="pydocx-delete">BBB</span>
+                </p>
             </li>
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -664,11 +677,12 @@ class InsertTagInList(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
             <li>
-                AAA
-                <br />
-                <span class="pydocx-insert">BBB</span>
+                <p>AAA</p>
+                <p>
+                    <span class="pydocx-insert">BBB</span>
+                </p>
             </li>
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -695,11 +709,10 @@ class SmartTagInList(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
             <li>
-                AAA
-                <br />
-                BBB
+                <p>AAA</p>
+                <p>BBB</p>
             </li>
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -725,7 +738,7 @@ def get_xml(self):
 class SingleListItem(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-lowerLetter">
-            <li>AAA</li>
+            <li><p>AAA</p></li>
         </ol>
         <p>BBB</p>
     '''
@@ -752,19 +765,19 @@ class SimpleTableTest(TranslationTestCase):
     expected_output = '''
         <table border="1">
             <tr>
-                <td>Blank</td>
-                <td>Column 1</td>
-                <td>Column 2</td>
+                <td><p>Blank</p></td>
+                <td><p>Column 1</p></td>
+                <td><p>Column 2</p></td>
             </tr>
             <tr>
-                <td>Row 1</td>
-                <td>First</td>
-                <td>Second</td>
+                <td><p>Row 1</p></td>
+                <td><p>First</p></td>
+                <td><p>Second</p></td>
             </tr>
             <tr>
-                <td>Row 2</td>
-                <td>Third</td>
-                <td>Fourth</td>
+                <td><p>Row 2</p></td>
+                <td><p>Third</p></td>
+                <td><p>Fourth</p></td>
             </tr>
         </table>'''
 
@@ -790,10 +803,11 @@ def get_xml(self):
 class MissingIlvl(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
-            <li>AAA<br />
-                BBB
+            <li>
+                <p>AAA</p>
+                <p>BBB</p>
             </li>
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -814,18 +828,19 @@ def get_xml(self):
 class SameNumIdInTable(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-lowerLetter">
-            <li>AAA
+            <li>
+                <p>AAA</p>
                 <table border="1">
                     <tr>
                         <td>
                             <ol class="pydocx-list-style-type-lowerLetter">
-                                <li>BBB</li>
+                                <li><p>BBB</p></li>
                             </ol>
                         </td>
                     </tr>
                 </table>
             </li>
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -858,9 +873,11 @@ def get_xml(self):
 class SDTTestCase(TranslationTestCase):
     expected_output = '''
         <ol class="pydocx-list-style-type-decimal">
-            <li>AAABBB
+            <li>
+                <p>AAA</p>
+                <p>BBB</p>
             </li>
-            <li>CCC</li>
+            <li><p>CCC</p></li>
         </ol>
     '''
 
@@ -1023,16 +1040,23 @@ def get_xml(self):
 class NestedListTestCase(TranslationTestCase):
     expected_output = u"""
     <ol class="pydocx-list-style-type-decimal">
-        <li>AAA
+        <li>
+            <p>AAA</p>
             <ol class="pydocx-list-style-type-decimal">
-                <li>BBB</li>
+                <li>
+                    <p>BBB</p>
+                </li>
             </ol>
         </li>
-        <li>CCC
+        <li>
+            <p>CCC</p>
             <ol class="pydocx-list-style-type-decimal">
-                <li>DDD
+                <li>
+                    <p>DDD</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>EEE</li>
+                        <li>
+                            <p>EEE</p>
+                        </li>
                     </ol>
                 </li>
             </ol>
@@ -1068,58 +1092,58 @@ class MultipleNestedListTestCase(TranslationTestCase):
     expected_output = u"""
     <ol class="pydocx-list-style-type-decimal">
         <li>
-            AAA
+            <p>AAA</p>
             <ol class="pydocx-list-style-type-decimal">
                 <li>
-                    BBB
+                    <p>BBB</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>CCC</li>
-                        <li>DDD</li>
+                        <li><p>CCC</p></li>
+                        <li><p>DDD</p></li>
                     </ol>
                 </li>
                 <li>
-                    EEE
+                    <p>EEE</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>FFF</li>
-                        <li>GGG</li>
+                        <li><p>FFF</p></li>
+                        <li><p>GGG</p></li>
                     </ol>
                 </li>
                 <li>
-                    HHH
+                    <p>HHH</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>III</li>
-                        <li>JJJ</li>
+                        <li><p>III</p></li>
+                        <li><p>JJJ</p></li>
                     </ol>
                 </li>
             </ol>
         </li>
-        <li>KKK</li>
+        <li><p>KKK</p></li>
     </ol>
     <ol class="pydocx-list-style-type-lowerLetter">
         <li>
-            LLL
+            <p>LLL</p>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>MMM</li>
-                <li>NNN</li>
+                <li><p>MMM</p></li>
+                <li><p>NNN</p></li>
             </ol>
         </li>
         <li>
-            OOO
+            <p>OOO</p>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>PPP</li>
+                <li><p>PPP</p></li>
                 <li>
-                    QQQ
+                    <p>QQQ</p>
                     <ol class="pydocx-list-style-type-decimal">
-                        <li>RRR</li>
+                        <li><p>RRR</p></li>
                     </ol>
                 </li>
             </ol>
         </li>
         <li>
-            SSS
+            <p>SSS</p>
             <ol class="pydocx-list-style-type-lowerLetter">
-                <li>TTT</li>
-                <li>UUU</li>
+                <li><p>TTT</p></li>
+                <li><p>UUU</p></li>
             </ol>
         </li>
     </ol>
diff --git a/tests/fixtures/export_from_googledocs.docx b/tests/fixtures/export_from_googledocs.docx
index 9939ffb7..a2601f55 100644
Binary files a/tests/fixtures/export_from_googledocs.docx and b/tests/fixtures/export_from_googledocs.docx differ
diff --git a/tests/fixtures/external_image.docx b/tests/fixtures/external_image.docx
index 2f6aaf60..1a83b4b9 100644
Binary files a/tests/fixtures/external_image.docx and b/tests/fixtures/external_image.docx differ
diff --git a/tests/fixtures/fake_subscript.html b/tests/fixtures/fake_subscript.html
index 6bbf5a11..10fade6f 100644
--- a/tests/fixtures/fake_subscript.html
+++ b/tests/fixtures/fake_subscript.html
@@ -1 +1,5 @@
-<p>H<sub>2</sub>O</p>
+<p style="margin-bottom:1.18em">
+    H
+    <sub>2</sub>
+    O
+</p>
diff --git a/tests/fixtures/fake_superscript.html b/tests/fixtures/fake_superscript.html
index 99b80941..583baa36 100644
--- a/tests/fixtures/fake_superscript.html
+++ b/tests/fixtures/fake_superscript.html
@@ -1 +1,4 @@
-<p>n<sup>th</sup></p>
+<p style="margin-bottom:1.18em">
+    n
+    <sup>th</sup>
+</p>
\ No newline at end of file
diff --git a/tests/fixtures/has_title.html b/tests/fixtures/has_title.html
index e54765be..26a3bd34 100644
--- a/tests/fixtures/has_title.html
+++ b/tests/fixtures/has_title.html
@@ -1,2 +1,3 @@
 <p>Title</p>
-<p><span class="pydocx-left">Text</span></p>
+<p class="pydocx-left" style="line-height:42.0%;margin-bottom:1.00em">&#160;</p>
+<p class="pydocx-left" style="margin-bottom:1.00em">Text</p>
diff --git a/tests/fixtures/justification.html b/tests/fixtures/justification.html
index d0221649..0881ec23 100644
--- a/tests/fixtures/justification.html
+++ b/tests/fixtures/justification.html
@@ -1,22 +1,8 @@
-<p><span class="pydocx-center">Center Justified</span></p>
-<p><span class="pydocx-right">Right justified</span></p>
-<p>
-  <span style="margin-right:6.00em">
-  <span class="pydocx-right">
-    Right justified and pushed in from right
-  </span>
-  </span>
- </p>
-<p>
-  <span style="margin-left:15.75em;margin-right:6.00em">
-  <span class="pydocx-center">
-    Center justified and pushed in from left and it is great and it is the
-    coolest thing of all time and I like it and I think it is cool
-  </span>
-  </span>
-</p>
-<p>
-  <span style="margin-left:15.75em;margin-right:6.00em">
-    Left justified and pushed in from left
-  </span>
-</p>
+<p class="pydocx-center">Center Justified</p>
+<p class="pydocx-center">&#160;</p>
+<p class="pydocx-right">Right justified</p>
+<p class="pydocx-right">&#160;</p>
+<p class="pydocx-right" style="margin-right:6.00em">Right justified and pushed in from right</p>
+<p class="pydocx-right" style="margin-right:6.00em">&#160;</p>
+<p class="pydocx-center" style="margin-left:15.75em;margin-right:6.00em">Center justified and pushed in from left and it is great and it is the coolest thing of all time and I like it and I think it is cool</p>
+<p style="margin-left:15.75em;margin-right:6.00em">Left justified and pushed in from left</p>
\ No newline at end of file
diff --git a/tests/fixtures/list_in_table.docx b/tests/fixtures/list_in_table.docx
index d1a87388..b0e47e76 100644
Binary files a/tests/fixtures/list_in_table.docx and b/tests/fixtures/list_in_table.docx differ
diff --git a/tests/fixtures/list_in_table.html b/tests/fixtures/list_in_table.html
index a0bf3824..05be4223 100644
--- a/tests/fixtures/list_in_table.html
+++ b/tests/fixtures/list_in_table.html
@@ -2,10 +2,11 @@
   <tr>
     <td>
       <ol class="pydocx-list-style-type-decimal">
-        <li>AAA</li>
-        <li>BBB</li>
-        <li>CCC</li>
+        <li><p>AAA</p></li>
+        <li><p>BBB</p></li>
+        <li><p>CCC</p></li>
       </ol>
     </td>
   </tr>
 </table>
+<p>&#160;</p>
\ No newline at end of file
diff --git a/tests/fixtures/lists_with_margins.docx b/tests/fixtures/lists_with_margins.docx
index a0db187c..b78e60e4 100644
Binary files a/tests/fixtures/lists_with_margins.docx and b/tests/fixtures/lists_with_margins.docx differ
diff --git a/tests/fixtures/lists_with_margins.html b/tests/fixtures/lists_with_margins.html
index f06c3c69..552847f1 100644
--- a/tests/fixtures/lists_with_margins.html
+++ b/tests/fixtures/lists_with_margins.html
@@ -1,15 +1,18 @@
 <ol class="pydocx-list-style-type-decimal">
-    <li style="margin-left:4.50em">AAA</li>
-    <li style="margin-left:4.50em">BBB
+    <li style="margin-left:4.50em"><p>AAA</p></li>
+    <li style="margin-left:4.50em">
+        <p>BBB</p>
         <ol class="pydocx-list-style-type-lowerRoman">
-            <li style="margin-left:3.00em">CCC</li>
-            <li style="margin-left:3.00em">DDD
+            <li style="margin-left:3.00em"><p>CCC</p></li>
+            <li style="margin-left:3.00em">
+                <p>DDD</p>
                 <ol class="pydocx-list-style-type-lowerLetter">
-                    <li style="margin-left:3.00em">EEE</li>
-                    <li style="margin-left:3.00em">FFF
+                    <li style="margin-left:3.00em"><p>EEE</p></li>
+                    <li style="margin-left:3.00em">
+                        <p>FFF</p>
                         <ol class="pydocx-list-style-type-lowerRoman">
-                            <li>GGG</li>
-                            <li>HHH</li>
+                            <li><p>GGG</p></li>
+                            <li><p>HHH</p></li>
                         </ol>
                     </li>
                 </ol>
diff --git a/tests/fixtures/lists_with_styles.html b/tests/fixtures/lists_with_styles.html
index 72c5c552..ed3e4e15 100644
--- a/tests/fixtures/lists_with_styles.html
+++ b/tests/fixtures/lists_with_styles.html
@@ -1,13 +1,20 @@
 <ol class="pydocx-list-style-type-decimal">
-    <li>AAA</li>
-    <li>BBB
+    <li><p>AAA</p></li>
+    <li>
+        <p>BBB</p>
         <ol class="pydocx-list-style-type-lowerRoman">
-            <li style="margin-left:-1.50em">CCC</li>
-            <li style="margin-left:-1.50em">DDD
+            <li style="margin-left:-1.50em">
+                <p>CCC</p>
+            </li>
+            <li style="margin-left:-1.50em">
+                <p>DDD</p>
                 <ol class="pydocx-list-style-type-upperLetter">
-                    <li style="margin-left:-1.50em">EEE
+                    <li style="margin-left:-1.50em">
+                        <p>EEE</p>
                         <ol class="pydocx-list-style-type-lowerLetter">
-                            <li style="margin-left:-1.50em">FFF</li>
+                            <li style="margin-left:-1.50em">
+                                <p>FFF</p>
+                            </li>
                         </ol>
                     </li>
                 </ol>
diff --git a/tests/fixtures/nested_lists.html b/tests/fixtures/nested_lists.html
index 6d8221f0..c46c87c4 100644
--- a/tests/fixtures/nested_lists.html
+++ b/tests/fixtures/nested_lists.html
@@ -1,30 +1,45 @@
 <ol class="pydocx-list-style-type-decimal">
-    <li>one</li>
-    <li>two</li>
-    <li>three
+    <li><p>one</p></li>
+    <li><p>two</p></li>
+    <li>
+        <p>three</p>
         <ol class="pydocx-list-style-type-decimal">
-            <li style="margin-left:-1.50em">AAA</li>
-            <li style="margin-left:-1.50em">BBB</li>
-            <li style="margin-left:-1.50em">CCC
+            <li style="margin-left:-1.50em"><p>AAA</p></li>
+            <li style="margin-left:-1.50em"><p>BBB</p></li>
+            <li style="margin-left:-1.50em">
+                <p>CCC</p>
                 <ol class="pydocx-list-style-type-decimal">
-                    <li style="margin-left:-1.50em">alpha</li>
+                    <li style="margin-left:-1.50em">
+                        <p>alpha</p>
+                    </li>
                 </ol>
             </li>
         </ol>
     </li>
-    <li>four</li>
+    <li>
+        <p>four</p>
+    </li>
 </ol>
+<p>&#160;</p>
+<p>&#160;</p>
 <ol class="pydocx-list-style-type-decimal">
-    <li>xxx
+    <li>
+        <p>xxx</p>
         <ol class="pydocx-list-style-type-decimal">
-            <li style="margin-left:-1.50em">yyy</li>
+            <li style="margin-left:-1.50em">
+                <p>yyy</p>
+            </li>
         </ol>
     </li>
 </ol>
+<p>&#160;</p>
 <ul>
-    <li>www
+    <li>
+        <p>www</p>
         <ul>
-            <li style="margin-left:-1.50em">zzz</li>
+            <li style="margin-left:-1.50em">
+                <p>zzz</p>
+            </li>
         </ul>
     </li>
 </ul>
diff --git a/tests/fixtures/nested_lists_different_num_ids.html b/tests/fixtures/nested_lists_different_num_ids.html
index 9f3562a9..b66ebf15 100644
--- a/tests/fixtures/nested_lists_different_num_ids.html
+++ b/tests/fixtures/nested_lists_different_num_ids.html
@@ -1,28 +1,30 @@
 <ol class="pydocx-list-style-type-decimal">
-    <li>one</li>
-    <li>two
+    <li><p>one</p></li>
+    <li>
+        <p>two</p>
         <ul>
-            <li style="margin-left:-1.50em">AAA1</li>
-            <li style="margin-left:-1.50em">BBB1</li>
-            <li style="margin-left:-1.50em">CCC1</li>
+            <li style="margin-left:-1.50em"><p>AAA1</p></li>
+            <li style="margin-left:-1.50em"><p>BBB1</p></li>
+            <li style="margin-left:-1.50em"><p>CCC1</p></li>
         </ul>
         <ul>
-            <li>CCC11</li>
-            <li>CCC12
+            <li><p>CCC11</p></li>
+            <li><p>CCC12</p>
                 <ul>
-                    <li style="margin-left:3.00em">CCC121</li>
-                    <li style="margin-left:3.00em">CCC122</li>
+                    <li style="margin-left:3.00em"><p>CCC121</p></li>
+                    <li style="margin-left:3.00em"><p>CCC122</p></li>
                 </ul>
             </li>
         </ul>
     </li>
-    <li>three
+    <li>
+        <p>three</p>
         <ul>
-            <li style="margin-left:-1.50em">AAA2</li>
-            <li style="margin-left:-1.50em">BBB2</li>
-            <li style="margin-left:-1.50em">CCC2</li>
+            <li style="margin-left:-1.50em"><p>AAA2</p></li>
+            <li style="margin-left:-1.50em"><p>BBB2</p></li>
+            <li style="margin-left:-1.50em"><p>CCC2</p></li>
         </ul>
     </li>
-    <li>four</li>
-    <li>five</li>
+    <li><p>four</p></li>
+    <li><p>five</p></li>
 </ol>
diff --git a/tests/fixtures/nested_table_rowspan.html b/tests/fixtures/nested_table_rowspan.html
index 73e9424b..bc429320 100644
--- a/tests/fixtures/nested_table_rowspan.html
+++ b/tests/fixtures/nested_table_rowspan.html
@@ -1,19 +1,21 @@
 <table border="1">
     <tr>
-        <td colspan="2">AAA</td>
+        <td colspan="2"><p>AAA</p></td>
     </tr>
     <tr>
-        <td>BBB</td>
+        <td><p>BBB</p></td>
         <td>
             <table border="1">
                 <tr>
-                    <td rowspan="2">CCC</td>
-                    <td>DDD</td>
+                    <td rowspan="2"><p>CCC</p></td>
+                    <td><p>DDD</p></td>
                 </tr>
                 <tr>
-                    <td>EEE</td>
+                    <td><p>EEE</p></td>
                 </tr>
             </table>
+            <p>&#160;</p>
         </td>
     </tr>
 </table>
+<p>&#160;</p>
\ No newline at end of file
diff --git a/tests/fixtures/nested_tables.docx b/tests/fixtures/nested_tables.docx
index af704d4d..95962fd3 100644
Binary files a/tests/fixtures/nested_tables.docx and b/tests/fixtures/nested_tables.docx differ
diff --git a/tests/fixtures/nested_tables.html b/tests/fixtures/nested_tables.html
index ad5bf2f6..3919ba24 100644
--- a/tests/fixtures/nested_tables.html
+++ b/tests/fixtures/nested_tables.html
@@ -1,21 +1,23 @@
 <table border="1">
     <tr>
-        <td>AAA</td>
-        <td>BBB</td>
+        <td><p>AAA</p></td>
+        <td><p>BBB</p></td>
     </tr>
     <tr>
-        <td>CCC</td>
+        <td><p>CCC</p></td>
         <td>
             <table border="1">
                 <tr>
-                    <td>DDD</td>
-                    <td>EEE</td>
+                    <td><p>DDD</p></td>
+                    <td><p>EEE</p></td>
                 </tr>
                 <tr>
-                    <td>FFF</td>
-                    <td>GGG</td>
+                    <td><p>FFF</p></td>
+                    <td><p>GGG</p></td>
                 </tr>
             </table>
+            <p>&#160;</p>
         </td>
     </tr>
 </table>
+<p>&#160;</p>
diff --git a/tests/fixtures/paragraph_indentation_inside_lists.docx b/tests/fixtures/paragraph_indentation_inside_lists.docx
new file mode 100644
index 00000000..ac5ea19f
Binary files /dev/null and b/tests/fixtures/paragraph_indentation_inside_lists.docx differ
diff --git a/tests/fixtures/paragraph_indentation_inside_lists.html b/tests/fixtures/paragraph_indentation_inside_lists.html
new file mode 100644
index 00000000..47876675
--- /dev/null
+++ b/tests/fixtures/paragraph_indentation_inside_lists.html
@@ -0,0 +1,29 @@
+<p style="text-indent:3.00em">Heading 1</p>
+<p>Heading 2</p>
+<p>&#160;</p>
+<ol class="pydocx-list-style-type-decimal">
+    <li>
+        <p>AAA</p>
+        <ol class="pydocx-list-style-type-lowerLetter">
+            <li>
+                <p>BBB</p>
+                <p>Heading 3</p>
+            </li>
+            <li>
+                <p>CCC</p>
+                <p style="margin-left:-6.00em">&#160;</p>
+                <p style="margin-left:-3.00em">Heading 4</p>
+                <p style="margin-left:-6.00em">&#160;</p>
+            </li>
+            <li>
+                <p>DDD</p>
+                <p style="margin-left:-6.00em">Heading 5</p>
+            </li>
+        </ol>
+    </li>
+    <li>
+        <p>EEE</p>
+    </li>
+</ol>
+<p>&#160;</p>
+<p class="pydocx-center">Heading 6</p>
diff --git a/tests/fixtures/paragraph_spacing.docx b/tests/fixtures/paragraph_spacing.docx
new file mode 100644
index 00000000..69ed0e3c
Binary files /dev/null and b/tests/fixtures/paragraph_spacing.docx differ
diff --git a/tests/fixtures/paragraph_spacing.html b/tests/fixtures/paragraph_spacing.html
new file mode 100644
index 00000000..460f13aa
--- /dev/null
+++ b/tests/fixtures/paragraph_spacing.html
@@ -0,0 +1,50 @@
+<p>AAA</p>
+<p>BBB</p>
+<p style="margin-top:0.83em">CCC</p>
+<p style="margin-top:0.83em">&#160;</p>
+<p style="margin-top:0.83em">DDD</p>
+<ol class="pydocx-list-style-type-decimal">
+    <li>
+        <p style="margin-top:0.83em">EEE</p>
+    </li>
+    <li>
+        <p>FFF</p>
+    </li>
+    <li style="margin-left:-0.01em">
+        <p style="margin-top:1.50em">GGG</p>
+    </li>
+    <li style="margin-left:-0.01em">
+        <p style="margin-bottom:1.00em;margin-top:1.50em">HHH</p>
+    </li>
+    <li style="margin-left:-0.01em">
+        <p>III</p>
+    </li>
+    <li style="margin-left:-0.01em">
+        <p>JJJ</p>
+    </li>
+</ol>
+<p style="margin-top:0.83em">&#160;</p>
+<table border="1">
+    <tr>
+        <td>
+            <p style="line-height:200.0%">KKK</p>
+        </td>
+        <td rowspan="2">
+            <p class="pydocx-center">&#160;</p>
+            <p class="pydocx-center">LLL</p>
+            <p class="pydocx-center">&#160;</p>
+        </td>
+        <td>
+            <p>MMM</p>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <p style="line-height:150.0%;margin-top:2.00em">NNN</p>
+        </td>
+        <td>
+            <p>OOO</p>
+        </td>
+    </tr>
+</table>
+<p style="margin-left:1.49em">&#160;</p>
\ No newline at end of file
diff --git a/tests/fixtures/paragraph_with_margins.html b/tests/fixtures/paragraph_with_margins.html
index 1b1098c5..40f223fc 100644
--- a/tests/fixtures/paragraph_with_margins.html
+++ b/tests/fixtures/paragraph_with_margins.html
@@ -1,11 +1,10 @@
 <p>Heading1</p>
-<p>
-    <span style="display:inline-block;margin-left:3.00em;text-indent:3.00em">Heading2</span>
-</p>
-<p>
-    <span style="display:inline-block;margin-left:3.00em;text-indent:3.00em">
-        <span class="pydocx-tab"></span>
-        <span class="pydocx-tab"></span>
-        Heading3
-    </span>
+<p>&#160;</p>
+<p style="margin-left:3.00em;text-indent:3.00em">Heading2</p>
+<p style="margin-left:3.00em;text-indent:3.00em">&#160;</p>
+<p style="margin-left:3.00em;text-indent:3.00em">&#160;</p>
+<p style="margin-left:3.00em;text-indent:3.00em">
+    <span class="pydocx-tab"></span>
+    <span class="pydocx-tab"></span>
+    Heading3
 </p>
diff --git a/tests/fixtures/read_same_image_multiple_times.docx b/tests/fixtures/read_same_image_multiple_times.docx
index 81667910..8797a328 100644
Binary files a/tests/fixtures/read_same_image_multiple_times.docx and b/tests/fixtures/read_same_image_multiple_times.docx differ
diff --git a/tests/fixtures/read_same_image_multiple_times.html b/tests/fixtures/read_same_image_multiple_times.html
index 7d86143b..95e811c7 100644
--- a/tests/fixtures/read_same_image_multiple_times.html
+++ b/tests/fixtures/read_same_image_multiple_times.html
@@ -1,6 +1,7 @@
+<p>&#160;</p>
 <p>
-<img height="90px" src="data:image/jpeg;base64,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" width="77px" />
+    <img height="90px" src="data:image/jpeg;base64,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" width="77px" />
+</p>
+<p>
+    <img height="90px" src="data:image/jpeg;base64,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" width="77px" />
 </p>
-<p><span class="pydocx-left">
-<img height="90px" src="data:image/jpeg;base64,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" width="77px" />
-</span></p>
diff --git a/tests/fixtures/shift_enter.html b/tests/fixtures/shift_enter.html
index 3b534e74..bc5cdb7e 100644
--- a/tests/fixtures/shift_enter.html
+++ b/tests/fixtures/shift_enter.html
@@ -1,16 +1,32 @@
 <p>AAA<br />BBB</p>
 <p>CCC</p>
+<p>&#160;</p>
 <ol class="pydocx-list-style-type-decimal">
-    <li>DDD<br />EEE</li>
-    <li>FFF</li>
+    <li>
+        <p>DDD<br />EEE</p>
+    </li>
+    <li>
+        <p>FFF</p>
+    </li>
 </ol>
+<p>&#160;</p>
 <table border="1">
     <tr>
-        <td>GGG<br />HHH</td>
-        <td>III<br />JJJ</td>
+        <td>
+            <p>GGG<br />HHH</p>
+        </td>
+        <td>
+            <p>III</p>
+            <p>JJJ</p>
+        </td>
     </tr>
     <tr>
-        <td>KKK</td>
-        <td>LLL</td>
+        <td>
+            <p>KKK</p>
+        </td>
+        <td>
+            <p>LLL</p>
+        </td>
     </tr>
 </table>
+<p>&#160;</p>
diff --git a/tests/fixtures/simple.html b/tests/fixtures/simple.html
index fe179fbb..1913ec62 100644
--- a/tests/fixtures/simple.html
+++ b/tests/fixtures/simple.html
@@ -1,18 +1,20 @@
-<p>
-  Simple text
-</p>
+<p>Simple text</p>
+<p>&#160;</p>
 <ol class="pydocx-list-style-type-decimal">
-  <li>one</li>
-  <li>two</li>
-  <li>three</li>
+    <li><p>one</p></li>
+    <li><p>two</p></li>
+    <li><p>three</p></li>
 </ol>
+<p>&#160;</p>
 <table border="1">
-  <tr>
-    <td>Cell1</td>
-    <td>Cell2</td>
-  </tr>
-  <tr>
-    <td>Cell3</td>
-    <td>Cell4</td>
-  </tr>
+    <tr>
+        <td><p>Cell1</p></td>
+        <td><p>Cell2</p></td>
+    </tr>
+    <tr>
+        <td><p>Cell3</p></td>
+        <td><p>Cell4</p></td>
+    </tr>
 </table>
+<p>&#160;</p>
+
diff --git a/tests/fixtures/simple_lists.html b/tests/fixtures/simple_lists.html
index f3029284..fc05e9e5 100644
--- a/tests/fixtures/simple_lists.html
+++ b/tests/fixtures/simple_lists.html
@@ -1,6 +1,10 @@
 <ol class="pydocx-list-style-type-decimal">
-    <li>One</li>
+    <li>
+        <p>One</p>
+    </li>
 </ol>
 <ul>
-    <li>two</li>
+    <li>
+        <p>two</p>
+    </li>
 </ul>
diff --git a/tests/fixtures/simple_table.html b/tests/fixtures/simple_table.html
index a14b830c..000f5247 100644
--- a/tests/fixtures/simple_table.html
+++ b/tests/fixtures/simple_table.html
@@ -1,14 +1,18 @@
 <table border="1">
     <tr>
         <td rowspan="2">
-            Cell1<br />
-            Cell3
+            <p>Cell1</p>
+            <p>Cell3</p>
         </td>
-        <td>Cell2<br />
-            And I am writing in the table
+        <td>
+            <p>Cell2</p>
+            <p>And I am writing in the table</p>
         </td>
     </tr>
     <tr>
-        <td>Cell4</td>
+        <td>
+            <p>Cell4</p>
+        </td>
     </tr>
 </table>
+<p>&#160;</p>
diff --git a/tests/fixtures/styled_color.docx b/tests/fixtures/styled_color.docx
index b7d22abf..871765f4 100644
Binary files a/tests/fixtures/styled_color.docx and b/tests/fixtures/styled_color.docx differ
diff --git a/tests/fixtures/styled_color.html b/tests/fixtures/styled_color.html
index c9873ce3..01029449 100644
--- a/tests/fixtures/styled_color.html
+++ b/tests/fixtures/styled_color.html
@@ -1,8 +1,17 @@
-<p><span style="color:#FF0000">AAA</span></p>
-<p><span style="color:#31849B">BBB</span></p>
+<p>
+    <span style="color:#FF0000">AAA</span>
+</p>
+<p>
+    <span style="color:#31849B">BBB</span>
+</p>
+<p>&#160;</p>
 <table border="1">
-  <tr>
-    <td>CCC</td>
-  </tr>
+    <tr>
+        <td>
+            <p>CCC</p>
+        </td>
+    </tr>
 </table>
+<p>&#160;</p>
 <p>DDD</p>
+<p>&#160;</p>
diff --git a/tests/fixtures/table_col_row_span.html b/tests/fixtures/table_col_row_span.html
index 3d70e06d..19a89398 100644
--- a/tests/fixtures/table_col_row_span.html
+++ b/tests/fixtures/table_col_row_span.html
@@ -1,46 +1,58 @@
 <table border="1">
-  <tr>
-    <td colspan="2">AAA</td>
-  </tr>
-  <tr>
-    <td rowspan="2">BBB</td>
-    <td>CCC</td>
-  </tr>
-  <tr>
-    <td>DDD</td>
-  </tr>
-  <tr>
-    <td>
-        <span class="pydocx-right">EEE</span>
-    </td>
-    <td rowspan="2">FFF</td>
-  </tr>
-  <tr>
-    <td>
-     <span class="pydocx-right">GGG</span>
-    </td>
-  </tr>
+    <tr>
+        <td colspan="2">
+            <p>AAA</p>
+        </td>
+    </tr>
+    <tr>
+        <td rowspan="2">
+            <p>BBB</p>
+        </td>
+        <td>
+            <p>CCC</p>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <p>DDD</p>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <p class="pydocx-right">EEE</p>
+        </td>
+        <td rowspan="2">
+            <p>FFF</p>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <p class="pydocx-right">GGG</p>
+        </td>
+    </tr>
 </table>
+<p>&#160;</p>
 <table border="1">
-  <tr>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-  </tr>
-  <tr>
-    <td>5</td>
-    <td colspan="2" rowspan="2">6</td>
-    <td>7</td>
-  </tr>
-  <tr>
-    <td>8</td>
-    <td>9</td>
-  </tr>
-  <tr>
-    <td>10</td>
-    <td>11</td>
-    <td>12</td>
-    <td>13</td>
-  </tr>
+    <tr>
+        <td><p>1</p></td>
+        <td><p>2</p></td>
+        <td><p>3</p></td>
+        <td><p>4</p></td>
+    </tr>
+    <tr>
+        <td><p>5</p></td>
+        <td colspan="2" rowspan="2"><p>6</p></td>
+        <td><p>7</p></td>
+    </tr>
+    <tr>
+        <td><p>8</p></td>
+        <td><p>9</p></td>
+    </tr>
+    <tr>
+        <td><p>10</p></td>
+        <td><p>11</p></td>
+        <td><p>12</p></td>
+        <td><p>13</p></td>
+    </tr>
 </table>
+<p>&#160;</p>
diff --git a/tests/fixtures/table_with_multi_rowspan.html b/tests/fixtures/table_with_multi_rowspan.html
index 8f7a8396..57b45fb9 100644
--- a/tests/fixtures/table_with_multi_rowspan.html
+++ b/tests/fixtures/table_with_multi_rowspan.html
@@ -1 +1,23 @@
-<table border="1"><tr><td rowspan="2">First section</td><td>Item 1</td></tr><tr><td>Item 2</td></tr><tr><td rowspan="4">Second section</td><td>Item 1</td></tr><tr><td>Item 2</td></tr><tr><td>Item 3</td></tr><tr><td>Imte 4</td></tr></table>
+<table border="1">
+    <tr>
+        <td rowspan="2"><p>First section</p></td>
+        <td><p>Item 1</p></td>
+    </tr>
+    <tr>
+        <td><p>Item 2</p></td>
+    </tr>
+    <tr>
+        <td rowspan="4"><p>Second section</p></td>
+        <td><p>Item 1</p></td>
+    </tr>
+    <tr>
+        <td><p>Item 2</p></td>
+    </tr>
+    <tr>
+        <td><p>Item 3</p></td>
+    </tr>
+    <tr>
+        <td><p>Imte 4</p></td>
+    </tr>
+</table>
+<p>&#160;</p>
diff --git a/tests/fixtures/tables_in_lists.html b/tests/fixtures/tables_in_lists.html
index f2ea793f..f230e814 100644
--- a/tests/fixtures/tables_in_lists.html
+++ b/tests/fixtures/tables_in_lists.html
@@ -1,16 +1,30 @@
 <ol class="pydocx-list-style-type-decimal">
-    <li>AAA</li>
-    <li>BBB
+    <li>
+        <p>AAA</p>
+    </li>
+    <li>
+        <p>BBB</p>
         <table border="1">
             <tr>
-                <td>CCC</td>
-                <td>DDD</td>
+                <td>
+                    <p>CCC</p>
+                </td>
+                <td>
+                    <p>DDD</p>
+                </td>
             </tr>
             <tr>
-                <td>EEE</td>
-                <td>FFF</td>
+                <td>
+                    <p>EEE</p>
+                </td>
+                <td>
+                    <p>FFF</p>
+                </td>
             </tr>
         </table>
+        <p style="margin-left:-3.00em">&#160;</p>
+    </li>
+    <li>
+        <p>GGG</p>
     </li>
-    <li>GGG</li>
 </ol>
diff --git a/tests/fixtures/track_changes_on.html b/tests/fixtures/track_changes_on.html
index 935e97bd..2d6dabad 100644
--- a/tests/fixtures/track_changes_on.html
+++ b/tests/fixtures/track_changes_on.html
@@ -1 +1,3 @@
+<p>&#160;</p>
+<p>&#160;</p>
 <p>This was some content.</p>