diff --git a/README.md b/README.md
index 91bd33e3..de86d68f 100644
--- a/README.md
+++ b/README.md
@@ -166,10 +166,10 @@ OR, let's say FOO is your new favorite markup language. Simply customize your ow
 
 The base parser `Docx2Html` relies on certain css class being set for certain behaviour to occur. Currently these include:
 
-* class `insert` -> Turns the text green.
-* class `delete` -> Turns the text red and draws a line through the text.
-* class `center` -> Aligns the text to the center.
-* class `right` -> Aligns the text to the right.
-* class `left` -> Aligns the text to the left.
-* class `comment` -> Turns the text blue.
+* class `pydocx-insert` -> Turns the text green.
+* class `pydocx-delete` -> Turns the text red and draws a line through the text.
+* class `pydocx-center` -> Aligns the text to the center.
+* class `pydocx-right` -> Aligns the text to the right.
+* class `pydocx-left` -> Aligns the text to the left.
+* class `pydocx-comment` -> Turns the text blue.
 * class `pydocx-underline` -> Underlines the text.
diff --git a/pydocx/parsers/Docx2Html.py b/pydocx/parsers/Docx2Html.py
index 9aa78354..782be941 100644
--- a/pydocx/parsers/Docx2Html.py
+++ b/pydocx/parsers/Docx2Html.py
@@ -1,7 +1,6 @@
 from pydocx.DocxParser import DocxParser
 
 import xml.sax.saxutils
-import textwrap
 
 
 class Docx2Html(DocxParser):
@@ -21,16 +20,22 @@ def head(self):
         }
 
     def style(self):
-        return textwrap.dedent('''<style>.insert{{color:red}}.delete
-        {{color:red; text-decoration:line-through}}.center
-        {{text-align:center}}.right{{text-align:right}}
-        .left{{text-align:left}} .comment{{color:blue}}
-        .pydocx-underline {text-decoration: underline;}
-        body{{width:%(width)spx; margin:0px auto;
-        }}</style>''') % {
+        result = (
+            '<style>'
+            '.pydocx-insert {color:green;}'
+            '.pydocx-delete {color:red;text-decoration:line-through;}'
+            '.pydocx-center {text-align:center;}'
+            '.pydocx-right {text-align:right;}'
+            '.pydocx-left {text-align:left;}'
+            '.pydocx-comment {color:blue;}'
+            '.pydocx-underline {text-decoration: underline;}'
+            'body {width:%(width)spx;margin:0px auto;}'
+            '</style>'
+        ) % {
+            #multiple by (4/3) to get to px
             'width': (self.page_width * (4 / 3)),
         }
-        #multiple by (4/3) to get to px
+        return result
 
     def escape(self, text):
         return xml.sax.saxutils.quoteattr(text)[1:-1]
@@ -49,7 +54,7 @@ def heading(self, text, heading_value):
 
     def insertion(self, text, author, date):
         return (
-            "<span class='insert' author='%(author)s' "
+            "<span class='pydocx-insert' author='%(author)s' "
             "date='%(date)s'>%(text)s</span>"
         ) % {
             'author': author,
@@ -83,7 +88,7 @@ def image(self, path, x, y):
 
     def deletion(self, text, author, date):
         return (
-            "<span class='delete' author='%(author)s' "
+            "<span class='pydocx-delete' author='%(author)s' "
             "date='%(date)s'>%(text)s</span>"
         ) % {
             'author': author,
@@ -97,8 +102,9 @@ def list_element(self, text):
         }
 
     def ordered_list(self, text, list_style):
-        return "<ol>%(text)s</ol>" % {
+        return '<ol list-style-type="%(list_style)s">%(text)s</ol>' % {
             'text': text,
+            'list_style': list_style,
         }
 
     def unordered_list(self, text):
@@ -121,7 +127,7 @@ def tab(self):
         return '&nbsp&nbsp&nbsp&nbsp'
 
     def table(self, text):
-        return '<table border=1>' + text + '</table>'
+        return '<table border="1">' + text + '</table>'
 
     def table_row(self, text):
         return '<tr>' + text + '</tr>'
@@ -145,7 +151,7 @@ def page_break(self):
     def indent(self, text, just='', firstLine='', left='', right=''):
         slug = '<div'
         if just:
-            slug += " class='%(just)s'"
+            slug += " class='pydocx-%(just)s'"
         if firstLine or left or right:
             slug += " style='"
             if firstLine:
diff --git a/pydocx/tests/__init__.py b/pydocx/tests/__init__.py
index e509c397..d8247ffb 100644
--- a/pydocx/tests/__init__.py
+++ b/pydocx/tests/__init__.py
@@ -11,6 +11,28 @@
 )
 from unittest import TestCase
 
+STYLE = (
+    '<style>'
+    '.pydocx-insert {color:green;}'
+    '.pydocx-delete {color:red;text-decoration:line-through;}'
+    '.pydocx-center {text-align:center;}'
+    '.pydocx-right {text-align:right;}'
+    '.pydocx-left {text-align:left;}'
+    '.pydocx-comment {color:blue;}'
+    '.pydocx-underline {text-decoration: underline;}'
+    'body {width:612px;margin:0px auto;}'
+    '</style>'
+)
+
+BASE_HTML = '''
+<html>
+    <head>
+    %s
+    </head>
+    <body>%%s</body>
+</html>
+''' % STYLE
+
 
 def assert_html_equal(actual_html, expected_html):
     assert collapse_html(
@@ -78,6 +100,10 @@ def _build_data(
                 remove_namespaces(document_xml),
             )
 
+        # This is the standard page width for a word document, Also the page
+        # width that we are looking for in the test.
+        self.page_width = 612
+
     def _parse_rels_root(self, *args, **kwargs):
         if self._test_rels_dict is None:
             return {}
@@ -92,29 +118,6 @@ def get_list_style(self, num_id, ilvl):
     def _parse_styles(self):
         return {}
 
-    def head(self):
-        return ''
-
-    def table(self, text):
-        return '<table>' + text + '</table>'
-
-    def ordered_list(self, text, list_style):
-        list_type_conversions = {
-            'decimal': 'decimal',
-            'decimalZero': 'decimal-leading-zero',
-            'upperRoman': 'upper-roman',
-            'lowerRoman': 'lower-roman',
-            'upperLetter': 'upper-alpha',
-            'lowerLetter': 'lower-alpha',
-            'ordinal': 'decimal',
-            'cardinalText': 'decimal',
-            'ordinalText': 'decimal',
-        }
-        return '<ol data-list-type="{list_style}">{text}</ol>'.format(
-            list_style=list_type_conversions.get(list_style, 'decimal'),
-            text=text,
-        )
-
 
 DEFAULT_NUMBERING_DICT = {
     '1': {
@@ -122,8 +125,8 @@ def ordered_list(self, text, list_style):
         '1': 'decimal',
     },
     '2': {
-        '0': 'none',
-        '1': 'none',
+        '0': 'lowerLetter',
+        '1': 'lowerLetter',
     },
 }
 
@@ -159,4 +162,4 @@ def test_expected_output(self):
             numbering_dict=self.numbering_dict,
         ).parsed
 
-        assert_html_equal(html, self.expected_output)
+        assert_html_equal(html, BASE_HTML % self.expected_output)
diff --git a/pydocx/tests/test_docx.py b/pydocx/tests/test_docx.py
index 815d2ef2..72b98f5b 100644
--- a/pydocx/tests/test_docx.py
+++ b/pydocx/tests/test_docx.py
@@ -6,37 +6,12 @@
 from nose.plugins.skip import SkipTest
 #from nose.tools import assert_raises
 
-from pydocx.tests import assert_html_equal
+from pydocx.tests import assert_html_equal, BASE_HTML
 from pydocx.parsers.Docx2Html import Docx2Html
 
 
-class TestDocx2HTML(Docx2Html):
-    def head(self):
-        return ''
-
-    def table(self, text):
-        return '<table>' + text + '</table>'
-
-    def ordered_list(self, text, list_style):
-        list_type_conversions = {
-            'decimal': 'decimal',
-            'decimalZero': 'decimal-leading-zero',
-            'upperRoman': 'upper-roman',
-            'lowerRoman': 'lower-roman',
-            'upperLetter': 'upper-alpha',
-            'lowerLetter': 'lower-alpha',
-            'ordinal': 'decimal',
-            'cardinalText': 'decimal',
-            'ordinalText': 'decimal',
-        }
-        return '<ol data-list-type="{list_style}">{text}</ol>'.format(
-            list_style=list_type_conversions.get(list_style, 'decimal'),
-            text=text,
-        )
-
-
 def convert(path):
-    return TestDocx2HTML(path).parsed
+    return Docx2Html(path).parsed
 
 
 def test_extract_html():
@@ -47,17 +22,16 @@ def test_extract_html():
         'simple.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <p>
           Simple text
         </p>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
           <li>one</li>
           <li>two</li>
           <li>three</li>
         </ol>
-        <table>
+        <table border="1">
           <tr>
             <td>Cell1</td>
             <td>Cell2</td>
@@ -67,7 +41,6 @@ def test_extract_html():
             <td>Cell4</td>
           </tr>
         </table>
-    </body></html>
     ''')
 
 
@@ -79,17 +52,16 @@ def test_nested_list():
         'nested_lists.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-        <ol data-list-type="decimal">
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <ol list-style-type="decimal">
             <li>one</li>
             <li>two</li>
             <li>three
-                <ol data-list-type="decimal">
+                <ol list-style-type="decimal">
                     <li>AAA</li>
                     <li>BBB</li>
                     <li>CCC
-                        <ol data-list-type="decimal">
+                        <ol list-style-type="decimal">
                             <li>alpha</li>
                         </ol>
                     </li>
@@ -97,9 +69,9 @@ def test_nested_list():
             </li>
             <li>four</li>
         </ol>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>xxx
-                <ol data-list-type="decimal">
+                <ol list-style-type="decimal">
                     <li>yyy</li>
                 </ol>
             </li>
@@ -111,7 +83,6 @@ def test_nested_list():
                 </ul>
             </li>
         </ul>
-    </body></html>
     ''')
 
 
@@ -123,15 +94,13 @@ def test_simple_list():
         'simple_lists.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-        <ol data-list-type="decimal">
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <ol list-style-type="decimal">
             <li>One</li>
         </ol>
         <ul>
             <li>two</li>
         </ul>
-    </body></html>
     ''')
 
 
@@ -143,12 +112,11 @@ def test_inline_tags():
         'inline_tags.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, (
-        '<html><body><p>This sentence has some <strong>bold</strong>, '
+    assert_html_equal(actual_html, BASE_HTML % (
+        '<p>This sentence has some <strong>bold</strong>, '
         'some <em>italics</em> and some '
         '<span class="pydocx-underline">underline</span>, '
-        'as well as a <a href="http://www.google.com/">hyperlink</a>'
-        '.</p></body></html>'
+        'as well as a <a href="http://www.google.com/">hyperlink</a>.</p>'
     ))
 
 
@@ -172,8 +140,8 @@ def test_special_chars():
         'special_chars.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body><p>&amp; &lt; &gt; <a href="https://www.google.com/?test=1&amp;more=2">link</a></p></body></html>''')  # noqa
+    assert_html_equal(actual_html, BASE_HTML % '''
+    <p>&amp; &lt; &gt; <a href="https://www.google.com/?test=1&amp;more=2">link</a></p>''')  # noqa
 
 
 def test_table_col_row_span():
@@ -184,9 +152,8 @@ def test_table_col_row_span():
         'table_col_row_span.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-      <table>
+    assert_html_equal(actual_html, BASE_HTML % '''
+      <table border="1">
         <tr>
           <td colspan="2">AAA</td>
         </tr>
@@ -199,17 +166,17 @@ def test_table_col_row_span():
         </tr>
         <tr>
           <td>
-          <div class='right'>EEE
+          <div class='pydocx-right'>EEE
           </div></td>
           <td rowspan="2">FFF</td>
         </tr>
         <tr>
           <td>
-           <div class='right'>GGG
+           <div class='pydocx-right'>GGG
            </div></td>
         </tr>
       </table>
-      <table>
+      <table border="1">
         <tr>
           <td>1</td>
           <td>2</td>
@@ -232,7 +199,6 @@ def test_table_col_row_span():
           <td>13</td>
         </tr>
       </table>
-    </body></html>
     ''')
 
 
@@ -244,16 +210,15 @@ def test_nested_table_rowspan():
         'nested_table_rowspan.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-        <table>
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <table border="1">
             <tr>
                 <td colspan="2">AAA</td>
             </tr>
             <tr>
                 <td>BBB</td>
                 <td>
-                    <table>
+                    <table border="1">
                         <tr>
                             <td rowspan="2">CCC</td>
                             <td>DDD</td>
@@ -265,7 +230,6 @@ def test_nested_table_rowspan():
                 </td>
             </tr>
         </table>
-    </body></html>
     ''')
 
 
@@ -278,9 +242,8 @@ def test_nested_tables():
     )
     actual_html = convert(file_path)
     # Find out why br tag is there.
-    assert_html_equal(actual_html, '''
-    <html><body>
-        <table>
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <table border="1">
             <tr>
                 <td>AAA</td>
                 <td>BBB</td>
@@ -288,7 +251,7 @@ def test_nested_tables():
             <tr>
                 <td>CCC</td>
                 <td>
-                    <table>
+                    <table border="1">
                         <tr>
                             <td>DDD</td>
                             <td>EEE</td>
@@ -301,7 +264,6 @@ def test_nested_tables():
                 </td>
             </tr>
         </table>
-    </body></html>
     ''')
 
 
@@ -313,12 +275,11 @@ def test_list_in_table():
         'list_in_table.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-        <table>
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <table border="1">
           <tr>
             <td>
-              <ol data-list-type="decimal">
+              <ol list-style-type="decimal">
                 <li>AAA</li>
                 <li>BBB</li>
                 <li>CCC</li>
@@ -326,7 +287,6 @@ def test_list_in_table():
             </td>
           </tr>
         </table>
-    </body></html>
     ''')
 
 
@@ -338,12 +298,11 @@ def test_tables_in_lists():
         'tables_in_lists.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-        <ol data-list-type="decimal">
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <ol list-style-type="decimal">
             <li>AAA</li>
             <li>BBB
-                <table>
+                <table border="1">
                     <tr>
                         <td>CCC</td>
                         <td>DDD</td>
@@ -356,7 +315,6 @@ def test_tables_in_lists():
             </li>
             <li>GGG</li>
         </ol>
-    </body></html>
     ''')
 
 
@@ -368,8 +326,8 @@ def test_track_changes_on():
         'track_changes_on.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body><p>This was some content.</p></body></html>
+    assert_html_equal(actual_html, BASE_HTML % '''
+    <p>This was some content.</p>
     ''')
 
 
@@ -381,8 +339,7 @@ def test_headers():
         'headers.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <h1>This is an H1</h1>
         <h2>This is an H2</h2>
         <h3>This is an H3</h3>
@@ -393,7 +350,6 @@ def test_headers():
         <h6>This is an H8</h6>
         <h6>This is an H9</h6>
         <h6>This is an H10</h6>
-    </body></html>
     ''')
 
 
@@ -420,8 +376,8 @@ def test_split_headers():
     new_file_path, _ = _copy_file_to_tmp_dir(file_path, filename)
 
     actual_html = convert(new_file_path)
-    assert_html_equal(actual_html, '''
-    <html><body><h1>AAA</h1><p>BBB</p><h1>CCC</h1></body></html>
+    assert_html_equal(actual_html, BASE_HTML % '''
+    <h1>AAA</h1><p>BBB</p><h1>CCC</h1>
     ''')
 
 
@@ -440,10 +396,8 @@ def test_has_image():
 
     actual_html = convert(new_file_path)
     # Ignore height, width for now.
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <p>AAA<img src="media/image1.gif" height="55px" width="260px" /></p>
-    </body></html>
     ''')
 
 
@@ -457,10 +411,8 @@ def test_local_dpi():
     )
     new_file_path, dp = _copy_file_to_tmp_dir(file_path, filename)
     actual_html = convert(new_file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <p><img src="media/image1.jpeg" /></p>
-    </body></html>
     ''')
 
 
@@ -481,45 +433,11 @@ def test_has_image_using_image_handler():
     def image_handler(*args, **kwargs):
         return 'test'
     actual_html = convert(new_file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <p>AAA<img src="test" height="55" width="260" /></p>
-    </body></html>
     ''')
 
 
-#def test_attachment_is_tiff():
-#    filename = 'attachment_is_tiff.docx'
-#    file_path = path.join(
-#        path.abspath(path.dirname(__file__)),
-#        '..',
-#        'fixtures',
-#        'attachment_is_tiff.docx',
-#    )
-#    # preserve_images must be true in order for the image to not be removed.
-#    # This is handled in build_import, however here we need to manually set it
-#    # to True.
-#    new_file_path, _ = _copy_file_to_tmp_dir(file_path, filename)
-#
-#    # First open the file and verify that the image attachment is a tiff.
-#    try:
-#        zf = ZipFile(new_file_path)
-#        # Get the document data.
-#        _, meta_data = _get_document_data(zf)
-#    finally:
-#        zf.close()
-#    # Find the path to the image.
-#    image_file = None
-#    for file_path in meta_data.relationship_dict.values():
-#        if file_path.endswith('.gif'):
-#            image_file = file_path
-#    assert image_file is not None
-#    with open(image_file) as f:
-#        magic_number = f.read()[:4]
-#    # Make sure the image is actually a gif.
-#    assert magic_number == 'GIF8'
-
-
 def test_headers_with_full_line_styles():
     raise SkipTest('This test is not yet passing')
     # Show that if a natural header is completely bold/italics that
@@ -531,12 +449,10 @@ def test_headers_with_full_line_styles():
         'headers_with_full_line_styles.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <h2>AAA</h2>
         <h2>BBB</h2>
         <h2><strong>C</strong><em>C</em>C</h2>
-    </body></html>
     ''')
 
 
@@ -551,17 +467,16 @@ def test_convert_p_to_h():
         'convert_p_to_h.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <h2>AAA</h2>
         <h2>BBB</h2>
         <p>CCC</p>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li><strong>DDD</strong></li>
             <li><em>EEE</em></li>
             <li>FFF</li>
         </ol>
-        <table>
+        <table border="1">
             <tr>
                 <td><strong>GGG</strong></td>
                 <td><em>HHH</em></td>
@@ -571,43 +486,9 @@ def test_convert_p_to_h():
                 <td>JJJ</td>
             </tr>
         </table>
-    </body></html>
     ''')
 
 
-#def test_bigger_font_size_to_header():
-#    # Show when it is appropriate to convert p tags to h tags based on font
-#    # size.
-#    if not DETECT_FONT_SIZE:
-#        raise SkipTest('Font size detection is disabled.')
-#    file_path = path.join(
-#        path.abspath(path.dirname(__file__)),
-#        '..',
-#        'fixtures',
-#        'bigger_font_size_to_header.docx',
-#    )
-#    actual_html = convert(file_path)
-#    assert_html_equal(actual_html, '''
-#    <html>
-#        <p>Paragraphs:</p>
-#        <h2>Header</h2>
-#        <p>paragraph 1</p>
-#        <p>Lists:</p>
-#        <ol data-list-type="decimal">
-#            <li>bigger</li>
-#            <li>smaller</li>
-#        </ol>
-#        <p>Tables:</p>
-#        <table>
-#            <tr>
-#                <td>bigger</td>
-#                <td>smaller</td>
-#            </tr>
-#        </table>
-#    </html>
-#    ''')
-
-
 def test_fake_headings_by_length():
     raise SkipTest('This test is not yet passing')
     # Show that converting p tags to h tags has a length limit. If the p tag is
@@ -620,14 +501,12 @@ def test_fake_headings_by_length():
         'fake_headings_by_length.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <h2>Heading.</h2>
         <h2>Still a heading.</h2>
         <p>
         <strong>This is not a heading because it is too many words.</strong>
         </p>
-    </body></html>
     ''')
 
 
@@ -642,15 +521,14 @@ def test_shift_enter():
     # Test just the convert without clean_html to make sure the first
     # break tag is present.
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <p>AAA<br />BBB</p>
         <p>CCC</p>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>DDD<br />EEE</li>
             <li>FFF</li>
         </ol>
-        <table>
+        <table border="1">
             <tr>
                 <td>GGG<br />HHH</td>
                 <td>III<br />JJJ</td>
@@ -660,7 +538,6 @@ def test_shift_enter():
                 <td>LLL</td>
             </tr>
         </table>
-    </body></html>
     ''')
 
 
@@ -672,17 +549,16 @@ def test_lists_with_styles():
         'lists_with_styles.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-        <ol data-list-type="decimal">
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <ol list-style-type="decimal">
             <li>AAA</li>
             <li>BBB
-                <ol data-list-type="lower-roman">
+                <ol list-style-type="lowerRoman">
                     <li>CCC</li>
                     <li>DDD
-                        <ol data-list-type="upper-alpha">
+                        <ol list-style-type="upperLetter">
                             <li>EEE
-                                <ol data-list-type="lower-alpha">
+                                <ol list-style-type="lowerLetter">
                                     <li>FFF</li>
                                 </ol>
                             </li>
@@ -691,7 +567,6 @@ def test_lists_with_styles():
                 </ol>
             </li>
         </ol>
-    </body></html>
     ''')
 
 
@@ -706,25 +581,23 @@ def test_list_to_header():
     actual_html = convert(file_path)
     # It should be noted that list item `GGG` is upper roman in the word
     # document to show that only top level upper romans get converted.
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <h2>AAA</h2>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>BBB</li>
         </ol>
         <h2>CCC</h2>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>DDD</li>
         </ol>
         <h2>EEE</h2>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>FFF
-                <ol data-list-type="upper-roman">
+                <ol list-style-type="decimal">
                     <li>GGG</li>
                 </ol>
             </li>
         </ol>
-    </body></html>
     ''')
 
 
@@ -736,11 +609,10 @@ def test_has_title():
         'has_title.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(
-        actual_html,
-        '''<html><body><p>Title</p>
-        <p><div class='left'>Text</div></p></body></html>''',
-    )
+    assert_html_equal(actual_html, BASE_HTML % '''
+        <p>Title</p>
+        <p><div class='pydocx-left'>Text</div></p>
+    ''')
 
 
 def test_upper_alpha_all_bold():
@@ -752,12 +624,10 @@ def test_upper_alpha_all_bold():
         'upper_alpha_all_bold.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
         <h2>AAA</h2>
         <h2>BBB</h2>
         <h2>CCC</h2>
-    </body></html>
     ''')
 
 
@@ -769,14 +639,21 @@ def test_simple_table():
         'simple_table.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
-    <table>
-    <tr><td>Cell1<br />Cell3</td><td>Cell2<br />
-    And I am writing in the table</td></tr>
-    <tr><td></td><td>Cell4</td></tr>
+    assert_html_equal(actual_html, BASE_HTML % '''
+    <table border="1">
+        <tr>
+            <td>Cell1<br />
+                Cell3
+            </td>
+            <td>Cell2<br />
+                And I am writing in the table
+            </td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>Cell4</td>
+        </tr>
     </table>
-    </body></html>
     ''')
 
 
@@ -788,21 +665,21 @@ def test_justification():
         'justification.docx',
     )
     actual_html = convert(file_path)
-    assert_html_equal(actual_html, '''
-    <html><body>
+    assert_html_equal(actual_html, BASE_HTML % '''
     <p>
-        <div class='center'>Center Justified</div>
+        <div class='pydocx-center'>Center Justified</div>
     </p>
     <p>
-        <div class='right'>Right justified</div>
+        <div class='pydocx-right'>Right justified</div>
     </p>
     <p>
-        <div class='right' style='margin-right:96.0px;'>
+        <div class='pydocx-right' style='margin-right:96.0px;'>
             Right justified and pushed in from right
         </div>
     </p>
     <p>
-        <div class='center' style='margin-left:252.0px;margin-right:96.0px;'>
+        <div class='pydocx-center'
+                style='margin-left:252.0px;margin-right:96.0px;'>
             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
@@ -813,7 +690,6 @@ def test_justification():
             Left justified and pushed in from left
         </div>
     </p>
-    </body></html>
     ''')
 
 
diff --git a/pydocx/tests/test_xml.py b/pydocx/tests/test_xml.py
index fb1a47fe..4e5cf1a0 100644
--- a/pydocx/tests/test_xml.py
+++ b/pydocx/tests/test_xml.py
@@ -15,10 +15,8 @@
 
 class BoldTestCase(_TranslationTestCase):
     expected_output = """
-        <html><body>
-            <p><strong>AAA</strong></p>
-            <p>BBB</p>
-        </body></html>
+        <p><strong>AAA</strong></p>
+        <p>BBB</p>
     """
 
     def get_xml(self):
@@ -40,9 +38,7 @@ class HyperlinkVanillaTestCase(_TranslationTestCase):
     }
 
     expected_output = '''
-    <html><body>
         <p><a href="www.google.com">link</a>.</p>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -61,9 +57,7 @@ class HyperlinkWithMultipleRunsTestCase(_TranslationTestCase):
     }
 
     expected_output = '''
-    <html><body>
         <p><a href="www.google.com">link</a>.</p>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -80,10 +74,7 @@ class HyperlinkNoTextTestCase(_TranslationTestCase):
         'rId0': 'www.google.com',
     }
 
-    expected_output = '''
-    <html><body>
-    </body></html>
-    '''
+    expected_output = ''
 
     def get_xml(self):
         run_tags = []
@@ -98,11 +89,7 @@ class HyperlinkNotInRelsDictTestCase(_TranslationTestCase):
         # 'rId0': 'www.google.com', missing
     }
 
-    expected_output = '''
-    <html><body>
-        <p>link.</p>
-    </body></html>
-    '''
+    expected_output = '<p>link.</p>'
 
     def get_xml(self):
         run_tags = []
@@ -119,11 +106,7 @@ class HyperlinkWithBreakTestCase(_TranslationTestCase):
         'rId0': 'www.google.com',
     }
 
-    expected_output = '''
-    <html><body>
-        <p><a href="www.google.com">link<br /></a></p>
-    </body></html>
-    '''
+    expected_output = '<p><a href="www.google.com">link<br /></a></p>'
 
     def get_xml(self):
         run_tags = []
@@ -141,14 +124,12 @@ class ImageTestCase(_TranslationTestCase):
         'rId1': 'media/image2.jpeg',
     }
     expected_output = '''
-        <html><body>
-            <p>
-                <img src="media/image1.jpeg" height="20px" width="40px" />
-            </p>
-            <p>
-                <img src="media/image2.jpeg" height="21pt" width="41pt" />
-            </p>
-        </body></html>
+        <p>
+            <img src="media/image1.jpeg" height="20px" width="40px" />
+        </p>
+        <p>
+            <img src="media/image2.jpeg" height="21pt" width="41pt" />
+        </p>
     '''
 
     def get_xml(self):
@@ -216,10 +197,7 @@ class ImageNotInRelsDictTestCase(_TranslationTestCase):
     relationship_dict = {
         # 'rId0': 'media/image1.jpeg',
     }
-    expected_output = '''
-        <html><body>
-        </body></html>
-    '''
+    expected_output = ''
 
     def get_xml(self):
         drawing = DXB.drawing(height=20, width=40, r_id='rId0')
@@ -271,18 +249,16 @@ def get_xml(self):
 
 class TableTag(_TranslationTestCase):
     expected_output = '''
-        <html><body>
-            <table>
-                <tr>
-                    <td>AAA</td>
-                    <td>BBB</td>
-                </tr>
-                <tr>
-                    <td>CCC</td>
-                    <td>DDD</td>
-                </tr>
-            </table>
-        </body></html>
+        <table border="1">
+            <tr>
+                <td>AAA</td>
+                <td>BBB</td>
+            </tr>
+            <tr>
+                <td>CCC</td>
+                <td>DDD</td>
+            </tr>
+        </table>
     '''
 
     def get_xml(self):
@@ -299,8 +275,7 @@ def get_xml(self):
 
 class NestedTableTag(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <table>
+        <table border="1">
             <tr>
                 <td>AAA</td>
                 <td>BBB</td>
@@ -308,7 +283,7 @@ class NestedTableTag(_TranslationTestCase):
             <tr>
                 <td>CCC</td>
                 <td>
-                    <table>
+                    <table border="1">
                         <tr>
                             <td>DDD</td>
                             <td>EEE</td>
@@ -321,7 +296,6 @@ class NestedTableTag(_TranslationTestCase):
                 </td>
             </tr>
         </table>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -344,18 +318,16 @@ def get_xml(self):
 
 class TableWithInvalidTag(_TranslationTestCase):
     expected_output = '''
-        <html><body>
-            <table>
-                <tr>
-                    <td>AAA</td>
-                    <td>BBB</td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <td>DDD</td>
-                </tr>
-            </table>
-        </body></html>
+        <table border="1">
+            <tr>
+                <td>AAA</td>
+                <td>BBB</td>
+            </tr>
+            <tr>
+                <td></td>
+                <td>DDD</td>
+            </tr>
+        </table>
     '''
 
     def get_xml(self):
@@ -374,11 +346,10 @@ def get_xml(self):
 
 class TableWithListAndParagraph(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <table>
+        <table border="1">
             <tr>
                 <td>
-                    <ol data-list-type="decimal">
+                    <ol list-style-type="decimal">
                         <li>AAA</li>
                         <li>BBB</li>
                     </ol>
@@ -387,7 +358,6 @@ class TableWithListAndParagraph(_TranslationTestCase):
                 </td>
             </tr>
         </table>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -416,13 +386,11 @@ def get_xml(self):
 
 class SimpleListTestCase(_TranslationTestCase):
     expected_output = '''
-        <html><body>
-            <ol data-list-type="lower-alpha">
-                <li>AAA</li>
-                <li>BBB</li>
-                <li>CCC</li>
-            </ol>
-        </body></html>
+        <ol list-style-type="lowerLetter">
+            <li>AAA</li>
+            <li>BBB</li>
+            <li>CCC</li>
+        </ol>
     '''
 
     # Ensure its not failing somewhere and falling back to decimal
@@ -448,11 +416,9 @@ def get_xml(self):
 
 class SingleListItemTestCase(_TranslationTestCase):
     expected_output = '''
-        <html><body>
-            <ol data-list-type="lower-alpha">
-                <li>AAA</li>
-            </ol>
-        </body></html>
+        <ol list-style-type="lowerLetter">
+            <li>AAA</li>
+        </ol>
     '''
 
     # Ensure its not failing somewhere and falling back to decimal
@@ -476,24 +442,22 @@ def get_xml(self):
 
 class ListWithContinuationTestCase(_TranslationTestCase):
     expected_output = '''
-        <html><body>
-            <ol data-list-type="decimal">
-                <li>AAA<br />BBB</li>
-                <li>CCC
-                    <table>
-                        <tr>
-                            <td>DDD</td>
-                            <td>EEE</td>
-                        </tr>
-                        <tr>
-                            <td>FFF</td>
-                            <td>GGG</td>
-                        </tr>
-                    </table>
-                </li>
-                <li>HHH</li>
-            </ol>
-        </body></html>
+        <ol list-style-type="decimal">
+            <li>AAA<br />BBB</li>
+            <li>CCC
+                <table border="1">
+                    <tr>
+                        <td>DDD</td>
+                        <td>EEE</td>
+                    </tr>
+                    <tr>
+                        <td>FFF</td>
+                        <td>GGG</td>
+                    </tr>
+                </table>
+            </li>
+            <li>HHH</li>
+        </ol>
     '''
 
     def get_xml(self):
@@ -520,23 +484,21 @@ def get_xml(self):
 
 class ListWithMultipleContinuationTestCase(_TranslationTestCase):
     expected_output = '''
-        <html><body>
-            <ol data-list-type="decimal">
-                <li>AAA
-                    <table>
-                        <tr>
-                            <td>BBB</td>
-                        </tr>
-                    </table>
-                    <table>
-                        <tr>
-                            <td>CCC</td>
-                        </tr>
-                    </table>
-                </li>
-                <li>DDD</li>
-            </ol>
-        </body></html>
+        <ol list-style-type="decimal">
+            <li>AAA
+                <table border="1">
+                    <tr>
+                        <td>BBB</td>
+                    </tr>
+                </table>
+                <table border="1">
+                    <tr>
+                        <td>CCC</td>
+                    </tr>
+                </table>
+            </li>
+            <li>DDD</li>
+        </ol>
     '''
 
     def get_xml(self):
@@ -562,18 +524,16 @@ def get_xml(self):
 
 class MangledIlvlTestCase(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="lowerLetter">
             <li>AAA</li>
         </ol>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>BBB
-                <ol data-list-type="decimal">
+                <ol list-style-type="decimal">
                     <li>CCC</li>
                 </ol>
             </li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -592,17 +552,15 @@ def get_xml(self):
 
 class SeperateListsTestCase(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="lowerLetter">
             <li>AAA</li>
         </ol>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>BBB</li>
         </ol>
-        <ol data-list-type="decimal">
+        <ol list-style-type="lowerLetter">
             <li>CCC</li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -624,19 +582,17 @@ def get_xml(self):
 
 class InvalidIlvlOrderTestCase(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>AAA
-                <ol data-list-type="decimal">
+                <ol list-style-type="decimal">
                     <li>BBB
-                        <ol data-list-type="decimal">
+                        <ol list-style-type="decimal">
                             <li>CCC</li>
                         </ol>
                     </li>
                 </ol>
             </li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -654,8 +610,7 @@ def get_xml(self):
 
 
 class DeeplyNestedTableTestCase(_TranslationTestCase):
-    expected_output = '''
-    '''
+    expected_output = ''
     run_expected_output = False
 
     def get_xml(self):
@@ -686,10 +641,8 @@ def test_performance(self):
 
 class NonStandardTextTagsTestCase(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <p><span class='insert' author='' date=''>insert </span>
+        <p><span class='pydocx-insert' author='' date=''>insert </span>
         smarttag</p>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -705,7 +658,7 @@ def get_xml(self):
 
 
 class RTagWithNoText(_TranslationTestCase):
-    expected_output = '<html><body></body></html>'
+    expected_output = ''
 
     def get_xml(self):
         p_tag = DXB.p_tag(None)  # No text
@@ -720,14 +673,12 @@ def get_xml(self):
 
 class DeleteTagInList(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>AAA<br />
-                <span class='delete' author='' date=''>BBB</span>
+                <span class='pydocx-delete' author='' date=''>BBB</span>
             </li>
             <li>CCC</li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -744,14 +695,12 @@ def get_xml(self):
 
 class InsertTagInList(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>AAA<br />
-                <span class='insert' author='' date=''>BBB</span>
+                <span class='pydocx-insert' author='' date=''>BBB</span>
             </li>
             <li>CCC</li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -769,14 +718,12 @@ def get_xml(self):
 
 class SmartTagInList(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>AAA<br />
                 BBB
             </li>
             <li>CCC</li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -794,12 +741,10 @@ def get_xml(self):
 
 class SingleListItem(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="lower-alpha">
+        <ol list-style-type="lowerLetter">
             <li>AAA</li>
         </ol>
         <p>BBB</p>
-    </body></html>
     '''
 
     numbering_dict = {
@@ -822,11 +767,23 @@ def get_xml(self):
 
 class SimpleTableTest(_TranslationTestCase):
     expected_output = '''
-        <html><body>
-        <table><tr><td>Blank</td><td>Column 1</td><td>Column 2</td></tr>
-        <tr><td>Row 1</td><td>First</td><td>Second</td></tr>
-        <tr><td>Row 2</td><td>Third</td><td>Fourth</td></tr>
-        </table></body></html>'''
+        <table border="1">
+            <tr>
+                <td>Blank</td>
+                <td>Column 1</td>
+                <td>Column 2</td>
+            </tr>
+            <tr>
+                <td>Row 1</td>
+                <td>First</td>
+                <td>Second</td>
+            </tr>
+            <tr>
+                <td>Row 2</td>
+                <td>Third</td>
+                <td>Fourth</td>
+            </tr>
+        </table>'''
 
     def get_xml(self):
         table = DXB.table(num_rows=3, num_columns=3, text=chain(
@@ -848,14 +805,12 @@ def get_xml(self):
 
 class MissingIlvl(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>AAA<br />
                 BBB
             </li>
             <li>CCC</li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):
@@ -874,13 +829,12 @@ def get_xml(self):
 
 class SameNumIdInTable(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="lower-alpha">
+        <ol list-style-type="lowerLetter">
             <li>AAA
-                <table>
+                <table border="1">
                     <tr>
                         <td>
-                            <ol data-list-type="lower-alpha">
+                            <ol list-style-type="lowerLetter">
                                 <li>BBB</li>
                             </ol>
                         </td>
@@ -889,7 +843,6 @@ class SameNumIdInTable(_TranslationTestCase):
             </li>
             <li>CCC</li>
         </ol>
-    </body></html>
     '''
 
     # Ensure its not failing somewhere and falling back to decimal
@@ -921,14 +874,12 @@ def get_xml(self):
 
 class SDTTestCase(_TranslationTestCase):
     expected_output = '''
-    <html><body>
-        <ol data-list-type="decimal">
+        <ol list-style-type="decimal">
             <li>AAA<br />
                 BBB
             </li>
             <li>CCC</li>
         </ol>
-    </body></html>
     '''
 
     def get_xml(self):