diff --git a/bundle/Command/ConvertXmlTextToRichTextCommand.php b/bundle/Command/ConvertXmlTextToRichTextCommand.php
index 895deea2..be3600bd 100644
--- a/bundle/Command/ConvertXmlTextToRichTextCommand.php
+++ b/bundle/Command/ConvertXmlTextToRichTextCommand.php
@@ -5,8 +5,6 @@
 namespace EzSystems\EzPlatformXmlTextFieldTypeBundle\Command;
 
 use DOMDocument;
-use DOMXPath;
-use eZ\Publish\Core\FieldType\RichText\Converter;
 use eZ\Publish\Core\Persistence\Database\DatabaseHandler;
 use PDO;
 use Psr\Log\LoggerInterface;
@@ -14,13 +12,8 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use eZ\Publish\Core\FieldType\RichText\Converter\Aggregate;
-use eZ\Publish\Core\FieldType\XmlText\Converter\Expanding;
-use eZ\Publish\Core\FieldType\RichText\Converter\Ezxml\ToRichTextPreNormalize;
-use eZ\Publish\Core\FieldType\XmlText\Converter\EmbedLinking;
-use eZ\Publish\Core\FieldType\RichText\Converter\Xslt;
-use eZ\Publish\Core\FieldType\RichText\Validator;
 use eZ\Publish\Core\FieldType\XmlText\Value;
+use eZ\Publish\Core\FieldType\XmlText\Converter\RichText as RichTextConverter;
 
 class ConvertXmlTextToRichTextCommand extends ContainerAwareCommand
 {
@@ -29,16 +22,6 @@ class ConvertXmlTextToRichTextCommand extends ContainerAwareCommand
      */
     private $db;
     
-    /**
-     * @var \eZ\Publish\Core\FieldType\RichText\Converter
-     */
-    private $converter;
-    
-    /**
-     * @var \eZ\Publish\Core\FieldType\RichText\Validator
-     */
-    private $validator;
-
     /**
      * @var \Psr\Log\LoggerInterface
      */
@@ -50,28 +33,6 @@ public function __construct(DatabaseHandler $db, LoggerInterface $logger = null)
 
         $this->db = $db;
         $this->logger = $logger;
-
-        $this->converter = new Aggregate(
-            array(
-                new ToRichTextPreNormalize(new Expanding(), new EmbedLinking()),
-                new Xslt(
-                    './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/ezxml/docbook/docbook.xsl',
-                    array(
-                        array(
-                            'path' => './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/ezxml/docbook/core.xsl',
-                            'priority' => 99,
-                        ),
-                    )
-                ),
-            )
-        );
-
-        $this->validator = new Validator(
-            array(
-                './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/ezpublish.rng',
-                './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/docbook.iso.sch.xsl',
-            )
-        );
     }
 
     protected function configure()
@@ -92,6 +53,12 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Run the converter without writing anything to the database'
             )
+            ->addOption(
+                'disable-duplicate-id-check',
+                null,
+                InputOption::VALUE_NONE,
+                'Disable the check for duplicate html ids in every attribute. This might increase execution time on large databases'
+            )
             ->addOption(
                 'test-content-object',
                 null,
@@ -115,10 +82,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $dryRun = true;
         }
-        $this->convertFields($dryRun, $testContentObjectId, $output);
+        $this->convertFields($dryRun, $testContentObjectId, !$input->getOption('disable-duplicate-id-check'), $output);
     }
 
-    function convertFieldDefinitions($dryRun, OutputInterface $output)
+    protected function convertFieldDefinitions($dryRun, OutputInterface $output)
     {
         $query = $this->db->createSelectQuery();
         $query->select($query->expr->count('*'));
@@ -174,8 +141,9 @@ function convertFieldDefinitions($dryRun, OutputInterface $output)
         $output->writeln("Converted $count ezxmltext field definitions to ezrichtext");
     }
 
-    function convertFields($dryRun, $contentObjectId, OutputInterface $output)
+    protected function convertFields($dryRun, $contentObjectId, $checkDuplicateIds, OutputInterface $output)
     {
+        $converter = new RichTextConverter($this->logger);
         $query = $this->db->createSelectQuery();
         $query->select($query->expr->count('*'));
         $query->from('ezcontentobject_attribute');
@@ -238,7 +206,7 @@ function convertFields($dryRun, $contentObjectId, OutputInterface $output)
                 $inputValue = $row['data_text'];
             }
 
-            $converted = $this->convert($inputValue);
+            $converted = $converter->convert($this->createDocument($inputValue), $checkDuplicateIds, $row['id']);
 
             $updateQuery = $this->db->createUpdateQuery();
             $updateQuery->update($this->db->quoteIdentifier('ezcontentobject_attribute'));
@@ -279,7 +247,7 @@ function convertFields($dryRun, $contentObjectId, OutputInterface $output)
         $output->writeln("Converted $count ezxmltext fields to richtext");
     }
 
-    function createDocument($xmlString)
+    protected function createDocument($xmlString)
     {
         $document = new DOMDocument();
 
@@ -290,40 +258,4 @@ function createDocument($xmlString)
 
         return $document;
     }
-
-    function removeComments(DOMDocument $document)
-    {
-        $xpath = new DOMXpath($document);
-        $nodes = $xpath->query('//comment()');
-
-        for ($i = 0; $i < $nodes->length; ++$i) {
-            $nodes->item($i)->parentNode->removeChild($nodes->item($i));
-        }
-    }
-
-    function convert($xmlString)
-    {
-        $inputDocument = $this->createDocument($xmlString);
-
-        $this->removeComments($inputDocument);
-
-        $convertedDocument = $this->converter->convert($inputDocument);
-
-        // Needed by some disabled output escaping (eg. legacy ezxml paragraph <line/> elements)
-        $convertedDocumentNormalized = new DOMDocument();
-        $convertedDocumentNormalized->loadXML($convertedDocument->saveXML());
-
-        $errors = $this->validator->validate($convertedDocument);
-
-        $result = $convertedDocumentNormalized->saveXML();
-
-        if (!empty($errors)) {
-            $this->logger->error(
-                "Validation errors when converting xmlstring",
-                ['result' => $result, 'errors' => $errors, 'xmlString' => $xmlString]
-            );
-        }
-
-        return $result;
-    }
 }
diff --git a/lib/FieldType/XmlText/Converter/RichText.php b/lib/FieldType/XmlText/Converter/RichText.php
new file mode 100644
index 00000000..3f001b37
--- /dev/null
+++ b/lib/FieldType/XmlText/Converter/RichText.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the eZ Platform XmlText Field Type package.
+ *
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace eZ\Publish\Core\FieldType\XmlText\Converter;
+
+use eZ\Publish\Core\FieldType\XmlText\Converter;
+use DOMDocument;
+use DOMXPath;
+use Psr\Log\LoggerInterface;
+use eZ\Publish\Core\FieldType\RichText\Converter\Aggregate;
+use eZ\Publish\Core\FieldType\RichText\Converter\Ezxml\ToRichTextPreNormalize;
+use eZ\Publish\Core\FieldType\RichText\Converter\Xslt;
+use eZ\Publish\Core\FieldType\RichText\Validator;
+
+class RichText implements Converter
+{
+    /**
+     * @var \eZ\Publish\Core\FieldType\RichText\Converter
+     */
+    private $converter;
+
+    /**
+     * @var \eZ\Publish\Core\FieldType\RichText\Validator
+     */
+    private $validator;
+
+    public function __construct(LoggerInterface $logger = null)
+    {
+        $this->logger = $logger;
+
+        $this->converter = new Aggregate(
+            array(
+                new ToRichTextPreNormalize(new Expanding(), new EmbedLinking()),
+                new Xslt(
+                    './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/ezxml/docbook/docbook.xsl',
+                    array(
+                        array(
+                            'path' => './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/ezxml/docbook/core.xsl',
+                            'priority' => 99,
+                        ),
+                    )
+                ),
+            )
+        );
+
+        $this->validator = new Validator(
+            array(
+                './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/ezpublish.rng',
+                './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/docbook.iso.sch.xsl',
+            )
+        );
+    }
+
+    protected function removeComments(DOMDocument $document)
+    {
+        $xpath = new DOMXpath($document);
+        $nodes = $xpath->query('//comment()');
+
+        for ($i = 0; $i < $nodes->length; ++$i) {
+            $nodes->item($i)->parentNode->removeChild($nodes->item($i));
+        }
+    }
+
+    protected function reportNonUniqueIds(DOMDocument $document, $contentObjectAttributeId)
+    {
+        $xpath = new DOMXPath($document);
+        $ns = $document->documentElement->namespaceURI;
+        $nodes = $xpath->query("//*[contains(@xml:id, 'duplicated_id_')]");
+        foreach ($nodes as $node) {
+            $id=$node->attributes->getNamedItem('id')->nodeValue;
+            // id has format "duplicated_id_foo_bar_idm45226413447104" where "foo_bar" is the duplicated id
+            $duplicatedId = substr($id, strlen('duplicated_id_'), strrpos($id, '_') - strlen('duplicated_id_'));
+            if ($this->logger !== null) {
+                $this->logger->warning("Duplicated id in original ezxmltext for contentobject_attribute.id=$contentObjectAttributeId, automatically generated new id : $duplicatedId --> $id");
+            }
+        }
+    }
+
+    public function convert(DOMDocument $inputDocument, $checkDuplicateIds = false, $contentObjectAttributeId = null)
+    {
+        $this->removeComments($inputDocument);
+
+        $convertedDocument = $this->converter->convert($inputDocument);
+        if ($checkDuplicateIds) {
+            $this->reportNonUniqueIds($convertedDocument, $contentObjectAttributeId);
+        }
+
+        // Needed by some disabled output escaping (eg. legacy ezxml paragraph <line/> elements)
+        $convertedDocumentNormalized = new DOMDocument();
+        $convertedDocumentNormalized->loadXML($convertedDocument->saveXML());
+
+        $errors = $this->validator->validate($convertedDocument);
+
+        $result = $convertedDocumentNormalized->saveXML();
+
+        if (!empty($errors) && $this->logger !== null) {
+            $this->logger->error(
+                "Validation errors when converting ezxmltext for contentobject_attribute.id=$contentObjectAttributeId",
+                ['result' => $result, 'errors' => $errors, 'xmlString' => $inputDocument->saveXML()]
+            );
+        }
+
+        return $result;
+    }
+}
diff --git a/tests/lib/FieldType/Converter/RichTextTest.php b/tests/lib/FieldType/Converter/RichTextTest.php
new file mode 100644
index 00000000..eee381f4
--- /dev/null
+++ b/tests/lib/FieldType/Converter/RichTextTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * This file is part of the eZ Platform XmlText Field Type package.
+ *
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace EzSystems\EzPlatformXmlTextFieldType\Tests\FieldType\Converter;
+
+use eZ\Publish\Core\FieldType\XmlText\Converter\RichText;
+use DOMDocument;
+use DOMXPath;
+use PHPUnit\Framework\TestCase;
+
+class RichTextTest extends TestCase
+{
+    /**
+     * @param string $xml
+     * @param bool $isPath
+     *
+     * @return \DOMDocument
+     */
+    protected function createDocument($xml, $isPath = true)
+    {
+        $document = new DOMDocument();
+
+        $document->preserveWhiteSpace = false;
+        $document->formatOutput = false;
+
+        if ($isPath === true) {
+            $xml = file_get_contents($xml);
+        }
+
+        $document->loadXml($xml);
+
+        return $document;
+    }
+
+    /**
+     * Provider for conversion test.
+     *
+     * @return array
+     */
+    public function providerForTestConvert()
+    {
+        $map = array();
+
+        foreach (glob(__DIR__ . '/_fixtures/richtext/input/*.xml') as $inputFilePath) {
+            $basename = basename($inputFilePath, '.xml');
+            $outputFilePath = __DIR__ . "/_fixtures/richtext/output/{$basename}.xml";
+
+            $map[] = array($inputFilePath, $outputFilePath);
+        }
+
+        return $map;
+    }
+
+    protected function normalizeRewrittenIds(DOMDocument $xmlDoc)
+    {
+        $counter = 0;
+        $xpath = new DOMXPath($xmlDoc);
+        $nodes = $xpath->query("//*[contains(@xml:id, 'duplicated_id_')]");
+        foreach ($nodes as $node) {
+            $id=$node->attributes->getNamedItem('id')->nodeValue;
+            $node->attributes->getNamedItem('id')->nodeValue = "duplicated_id_foobar$counter";
+            ++$counter;
+        }
+    }
+
+    /**
+     * @param string $inputFilePath
+     * @param string $outputFilePath
+     *
+     * @dataProvider providerForTestConvert
+     */
+    public function testConvert($inputFilePath, $outputFilePath)
+    {
+        $inputDocument = $this->createDocument($inputFilePath);
+        $richText = new RichText(null);
+
+        $result = $richText->convert($inputDocument, true);
+
+        $convertedDocument = $this->createDocument($result, false);
+        $expectedDocument = $this->createDocument($outputFilePath);
+
+        // since duplicate ids are rewritten with random values, we need to normalize those
+        $this->normalizeRewrittenIds($convertedDocument);
+
+        $this->assertEquals(
+            $expectedDocument,
+            $convertedDocument
+        );
+    }
+}
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/001-title-dupid.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/001-title-dupid.xml
new file mode 100644
index 00000000..c228d3a4
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/001-title-dupid.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section xmlns:image="http://ez.no/namespaces/ezpublish3/image/" xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/" xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+        <ul>
+            <li>
+                <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+                    <line><link target="_blank" xhtml:id="inv5" url_id="2309">link with id inv5</link></line>
+                    <line> </line>
+                </paragraph>
+            </li>
+            <li>
+                <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+                    <line><link target="_blank" xhtml:id="inv5" url_id="2309">another link with id inv5</link></line>
+                    <line> </line>
+                </paragraph>
+            </li>
+        </ul>
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/002-embed-dupid.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/002-embed-dupid.xml
new file mode 100644
index 00000000..b9dc1f4b
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/002-embed-dupid.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph
+            xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">foobar test : embed
+    </paragraph>
+    <paragraph
+            xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+        <embed xhtml:id="myembed_id" view="embed" size="medium" custom:offset="0" custom:limit="5" object_id="84"/>
+    </paragraph>
+    <paragraph
+            xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">qweqweqwe : embed inline
+    </paragraph>
+    <paragraph
+            xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+        <embed-inline xhtml:id="myembed_id" view="embed-inline" size="medium" object_id="59"/>ezembedezembed
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/003-anchor-dupid.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/003-anchor-dupid.xml
new file mode 100644
index 00000000..5576f501
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/003-anchor-dupid.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>This is some
+        <anchor name="anchor"/> here
+    </paragraph>
+    <paragraph>And we have
+        <anchor name="anchor2"/> here
+    </paragraph>
+    <paragraph>And where we duplicate the first
+        <anchor name="anchor"/> indeed
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/004-embed-image-add-ez-embed-type-image.xml_ignore b/tests/lib/FieldType/Converter/_fixtures/richtext/input/004-embed-image-add-ez-embed-type-image.xml_ignore
new file mode 100644
index 00000000..b1154f44
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/004-embed-image-add-ez-embed-type-image.xml_ignore
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>Here we have a nice image</paragraph>
+    <paragraph>
+        <embed view="embed" size="medium" object_id="126" custom:offset="0" custom:limit="5"/>
+    </paragraph>
+    <paragraph>And here we have a file</paragraph>
+    <paragraph
+            xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+        <embed view="embed" size="medium" object_id="128" custom:offset="0" custom:limit="5"/>
+    </paragraph>
+</section>
\ No newline at end of file
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/010-align.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/010-align.xml
new file mode 100644
index 00000000..87605f7b
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/010-align.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph align="left">align left</paragraph>
+    <paragraph align="center">aligne center</paragraph>
+    <paragraph align="right">align right</paragraph>
+    <paragraph align="justify">align fullheader align fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheader</paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/020-bold.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/020-bold.xml
new file mode 100644
index 00000000..460284f9
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/020-bold.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>Some text
+        <strong>in bold</strong> here
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/030-emphasized.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/030-emphasized.xml
new file mode 100644
index 00000000..d97d3bd2
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/030-emphasized.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>some
+        <emphasize>emphasized</emphasize> text here
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/040-link.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/040-link.xml
new file mode 100644
index 00000000..cc1e40c3
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/040-link.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph align="justify">Here is an anchor
+        <anchor name="Anchor1"/>
+    </paragraph>
+    <paragraph align="justify">Let's link to
+        <link anchor_name="anchor1">the anchor</link>
+    </paragraph>
+    <paragraph align="justify">Link to
+        <link url_id="8">site</link>
+    </paragraph>
+    <paragraph align="justify">Link to
+        <link target="_blank" xhtml:title="customTitle" xhtml:id="customnodelinkid" node_id="61">node</link>
+    </paragraph>
+    <paragraph align="justify">link to
+        <link object_id="88">object</link>
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/050-literal_implicit.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/050-literal_implicit.xml
new file mode 100644
index 00000000..97f0a3dc
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/050-literal_implicit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>
+        <line xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">line1</line>
+        <line xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">line2</line>
+    </paragraph>
+    <paragraph>line3</paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/051-literal.xml_ignore b/tests/lib/FieldType/Converter/_fixtures/richtext/input/051-literal.xml_ignore
new file mode 100644
index 00000000..93739544
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/051-literal.xml_ignore
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>test</paragraph>
+    <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+        <literal>literal text</literal></paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/060-list_ordered.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/060-list_ordered.xml
new file mode 100644
index 00000000..cf2f22a4
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/060-list_ordered.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section xmlns:image="http://ez.no/namespaces/ezpublish3/image/" xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/" xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/"><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/"><ol><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">ordered list 1</paragraph></li><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">ordered list 2</paragraph></li><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/"><line>ordered <strong>bold </strong><emphasize>italic </emphasize><custom name="underline">underlined </custom><strong>all</strong></line><ol><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">indented ordered bullet</paragraph></li></ol></paragraph></li></ol></paragraph></section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/070-list_unordered.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/070-list_unordered.xml
new file mode 100644
index 00000000..9ee27d8c
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/070-list_unordered.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section xmlns:image="http://ez.no/namespaces/ezpublish3/image/" xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/" xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/"><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/"><ul><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">unordered bullet 1</paragraph></li><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">unordered bullet 2</paragraph></li><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/"><line>unordered <strong>bold </strong><emphasize>italic </emphasize><custom name="underline">underlined </custom><strong>all</strong></line><ul><li><paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">indented unordered bullet</paragraph></li></ul></paragraph></li></ul></paragraph></section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/080-header.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/080-header.xml
new file mode 100644
index 00000000..faf16929
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/080-header.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <section>
+        <header>header1text</header>
+        <paragraph>some paragraph</paragraph>
+        <section>
+            <header>header2text</header>
+            <paragraph>paragraph2</paragraph>
+            <section>
+                <header>header3text</header>
+                <paragraph>paragraph3</paragraph>
+                <section>
+                    <header>header4text</header>
+                    <paragraph>paragraph4</paragraph>
+                    <section>
+                        <header>header5text</header>
+                        <paragraph>paragraph5</paragraph>
+                        <section>
+                            <header>header6text</header>
+                            <paragraph>paragraph6</paragraph>
+                        </section>
+                    </section>
+                </section>
+            </section>
+        </section>
+    </section>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/090-table.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/090-table.xml
new file mode 100644
index 00000000..50b32a0a
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/090-table.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>some table</paragraph>
+    <paragraph
+            xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+        <table class="default" border="0" width="100%" custom:summary="custom summary" custom:caption="custom caption">
+            <tr>
+                <td>
+                    <paragraph>column1</paragraph>
+                </td>
+                <td>
+                    <paragraph>column2</paragraph>
+                </td>
+                <td>
+                    <paragraph>column3</paragraph>
+                </td>
+                <td>
+                    <paragraph>column4</paragraph>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <paragraph>text1</paragraph>
+                </td>
+                <td/>
+                <td/>
+                <td/>
+            </tr>
+            <tr>
+                <td/>
+                <td/>
+                <td>
+                    <paragraph>text2</paragraph>
+                </td>
+                <td/>
+            </tr>
+        </table>
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/100-underline.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/100-underline.xml
new file mode 100644
index 00000000..c13481ea
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/100-underline.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>some
+        <custom name="underline">underline</custom> test here
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/110-subscript-superscript.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/110-subscript-superscript.xml
new file mode 100644
index 00000000..3ec68fd8
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/input/110-subscript-superscript.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>x
+        <custom name="sub">subscript</custom> and y
+        <custom name="sup">superscript</custom>
+    </paragraph>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/001-title-dupid.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/001-title-dupid.xml
new file mode 100644
index 00000000..105b642a
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/001-title-dupid.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <itemizedlist>
+        <listitem>
+            <para>
+                <link xlink:href="ezurl://2309" xlink:show="new" xml:id="duplicated_id_foobar0">link with id inv5</link>
+            </para>
+        </listitem>
+        <listitem>
+            <para>
+                <link xlink:href="ezurl://2309" xlink:show="new" xml:id="duplicated_id_foobar1">another link with id inv5</link>
+            </para>
+        </listitem>
+    </itemizedlist>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/002-embed-dupid.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/002-embed-dupid.xml
new file mode 100644
index 00000000..ff9364f8
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/002-embed-dupid.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>foobar test : embed
+    </para>
+    <ezembed xlink:href="ezcontent://84" xml:id="duplicated_id_foobar0" view="embed">
+        <ezconfig>
+            <ezvalue key="size">medium</ezvalue>
+            <ezvalue key="offset">0</ezvalue>
+            <ezvalue key="limit">5</ezvalue>
+        </ezconfig>
+    </ezembed>
+    <para>qweqweqwe : embed inline
+    </para>
+    <para>
+        <ezembedinline xlink:href="ezcontent://59" xml:id="duplicated_id_foobar1" view="embed-inline">
+            <ezconfig>
+                <ezvalue key="size">medium</ezvalue>
+            </ezconfig>
+        </ezembedinline>ezembedezembed
+    </para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/003-anchor-dupid.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/003-anchor-dupid.xml
new file mode 100644
index 00000000..6e76db8a
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/003-anchor-dupid.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>This is some
+        <anchor xml:id="duplicated_id_foobar0"/> here
+    </para>
+    <para>And we have
+        <anchor xml:id="anchor2"/> here
+    </para>
+    <para>And where we duplicate the first
+        <anchor xml:id="duplicated_id_foobar1"/> indeed
+    </para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/004-embed-image-add-ez-embed-type-image.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/004-embed-image-add-ez-embed-type-image.xml
new file mode 100644
index 00000000..d7193ee9
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/004-embed-image-add-ez-embed-type-image.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>Here we have a nice image</para>
+    <ezembed xlink:href="ezcontent://126" view="embed" ezxhtml:class="ez-embed-type-image">
+        <ezconfig>
+            <ezvalue key="size">medium</ezvalue>
+            <ezvalue key="offset">0</ezvalue>
+            <ezvalue key="limit">5</ezvalue>
+        </ezconfig>
+    </ezembed>
+    <para>And here we have a file</para>
+    <ezembed xlink:href="ezcontent://128" view="embed">
+        <ezconfig>
+            <ezvalue key="size">medium</ezvalue>
+            <ezvalue key="offset">0</ezvalue>
+            <ezvalue key="limit">5</ezvalue>
+        </ezconfig>
+    </ezembed>
+</section>
\ No newline at end of file
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/010-align.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/010-align.xml
new file mode 100644
index 00000000..487648b4
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/010-align.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para ezxhtml:textalign="left">align left</para>
+    <para ezxhtml:textalign="center">aligne center</para>
+    <para ezxhtml:textalign="right">align right</para>
+    <para ezxhtml:textalign="justify">align fullheader align fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheader</para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/020-bold.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/020-bold.xml
new file mode 100644
index 00000000..b2066e97
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/020-bold.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>Some text
+        <emphasis role="strong">in bold</emphasis> here
+    </para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/030-emphasized.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/030-emphasized.xml
new file mode 100644
index 00000000..ffc2d487
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/030-emphasized.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>some
+        <emphasis>emphasized</emphasis> text here
+    </para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/040-link.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/040-link.xml
new file mode 100644
index 00000000..47c737a7
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/040-link.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para ezxhtml:textalign="justify">Here is an anchor
+        <anchor xml:id="Anchor1"/>
+    </para>
+    <para ezxhtml:textalign="justify">Let's link to
+        <link xlink:href="#anchor1" xlink:show="none">the anchor</link>
+    </para>
+    <para ezxhtml:textalign="justify">Link to
+        <link xlink:href="ezurl://8" xlink:show="none">site</link>
+    </para>
+    <para ezxhtml:textalign="justify">Link to
+        <link xlink:href="ezlocation://61" xlink:show="new" xlink:title="customTitle" xml:id="customnodelinkid">node</link>
+    </para>
+    <para ezxhtml:textalign="justify">link to
+        <link xlink:href="ezcontent://88" xlink:show="none">object</link>
+    </para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/050-literal_implicit.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/050-literal_implicit.xml
new file mode 100644
index 00000000..7fa943a5
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/050-literal_implicit.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>
+        <literallayout class="normal">line1
+line2</literallayout>
+    </para>
+    <para>line3</para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/051-literal.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/051-literal.xml
new file mode 100644
index 00000000..9ab4aa03
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/051-literal.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>test</para>
+    <para><literallayout class="normal">literal text</literallayout></para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/060-list_ordered.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/060-list_ordered.xml
new file mode 100644
index 00000000..9c4d698e
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/060-list_ordered.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml" xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0"><orderedlist><listitem><para>ordered list 1</para></listitem><listitem><para>ordered list 2</para></listitem><listitem><para>ordered <emphasis role="strong">bold </emphasis><emphasis>italic </emphasis><emphasis role="underlined">underlined </emphasis><emphasis role="strong">all</emphasis><orderedlist><listitem><para>indented ordered bullet</para></listitem></orderedlist></para></listitem></orderedlist></section>
\ No newline at end of file
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/070-list_unordered.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/070-list_unordered.xml
new file mode 100644
index 00000000..55711a2d
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/070-list_unordered.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml" xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0"><itemizedlist><listitem><para>unordered bullet 1</para></listitem><listitem><para>unordered bullet 2</para></listitem><listitem><para>unordered <emphasis role="strong">bold </emphasis><emphasis>italic </emphasis><emphasis role="underlined">underlined </emphasis><emphasis role="strong">all</emphasis><itemizedlist><listitem><para>indented unordered bullet</para></listitem></itemizedlist></para></listitem></itemizedlist></section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/080-header.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/080-header.xml
new file mode 100644
index 00000000..6275e6cd
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/080-header.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <title ezxhtml:level="2">header1text</title>
+    <para>some paragraph</para>
+    <title ezxhtml:level="3">header2text</title>
+    <para>paragraph2</para>
+    <title ezxhtml:level="4">header3text</title>
+    <para>paragraph3</para>
+    <title ezxhtml:level="5">header4text</title>
+    <para>paragraph4</para>
+    <title ezxhtml:level="6">header5text</title>
+    <para>paragraph5</para>
+    <title ezxhtml:level="6">header6text</title>
+    <para>paragraph6</para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/090-table.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/090-table.xml
new file mode 100644
index 00000000..6782c344
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/090-table.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>some table</para>
+    <table class="default" width="100%" title="custom summary">
+        <caption>custom caption</caption>
+        <tbody>
+            <tr>
+                <td>
+                    <para>column1</para>
+                </td>
+                <td>
+                    <para>column2</para>
+                </td>
+                <td>
+                    <para>column3</para>
+                </td>
+                <td>
+                    <para>column4</para>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <para>text1</para>
+                </td>
+                <td/>
+                <td/>
+                <td/>
+            </tr>
+            <tr>
+                <td/>
+                <td/>
+                <td>
+                    <para>text2</para>
+                </td>
+                <td/>
+            </tr>
+        </tbody>
+    </table>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/100-underline.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/100-underline.xml
new file mode 100644
index 00000000..8a2936e2
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/100-underline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>some
+        <emphasis role="underlined">underline</emphasis> test here
+    </para>
+</section>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/110-subscript-superscript.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/110-subscript-superscript.xml
new file mode 100644
index 00000000..0dea75a4
--- /dev/null
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/110-subscript-superscript.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
+        xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
+    <para>x
+        <subscript>subscript</subscript> and y
+        <superscript>superscript</superscript>
+    </para>
+</section>