diff --git a/library/HTMLPurifier/HTMLModule/Image.php b/library/HTMLPurifier/HTMLModule/Image.php
index 6608e9dc..dc9c732b 100644
--- a/library/HTMLPurifier/HTMLModule/Image.php
+++ b/library/HTMLPurifier/HTMLModule/Image.php
@@ -14,8 +14,6 @@ class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
 {
     
     var $name = 'Image';
-    var $elements = array('img');
-    var $content_sets = array('Inline' => 'img');
     
     function HTMLPurifier_HTMLModule_Image() {
         $img =& $this->addElement(
diff --git a/tests/HTMLPurifier/HTMLModule/BdoTest.php b/tests/HTMLPurifier/HTMLModule/BdoTest.php
index c402fc29..b2fcc1c8 100644
--- a/tests/HTMLPurifier/HTMLModule/BdoTest.php
+++ b/tests/HTMLPurifier/HTMLModule/BdoTest.php
@@ -7,6 +7,7 @@ class HTMLPurifier_HTMLModule_BdoTest extends HTMLPurifier_HTMLModuleHarness
     
     function test() {
         
+        // max
         $this->assertResult(
             '<span>
                  <bdo
@@ -23,6 +24,23 @@ class HTMLPurifier_HTMLModule_BdoTest extends HTMLPurifier_HTMLModuleHarness
              </span>', true, array('Attr.EnableID' => true)
         );
         
+        // min
+        $this->assertResult(
+            '<bdo></bdo>', '<bdo dir="ltr"></bdo>'
+        );
+        
+        // children
+        $this->assertResult(
+            '<bdo dir="rtl">Text<span></span><div></div></bdo>',
+            '<bdo dir="rtl">Text<span></span></bdo>'
+        );
+        
+        // global attr
+        $this->assertResult(
+            '<br dir="ltr" /><span dir="ltr"></span>',
+            '<br /><span dir="ltr"></span>'
+        );
+        
     }
     
 }
diff --git a/tests/HTMLPurifier/HTMLModule/EditTest.php b/tests/HTMLPurifier/HTMLModule/EditTest.php
new file mode 100644
index 00000000..3acf7917
--- /dev/null
+++ b/tests/HTMLPurifier/HTMLModule/EditTest.php
@@ -0,0 +1,58 @@
+<?php
+
+require_once 'HTMLPurifier/HTMLModuleHarness.php';
+
+class HTMLPurifier_HTMLModule_EditTest extends HTMLPurifier_HTMLModuleHarness
+{
+    
+    function test() {
+        
+        // max
+        $this->assertResult(
+            '<span>
+                 <ins cite="http://www.example.com/">
+                    #PCDATA <span></span>
+                 </ins>
+                 <del cite="http://www.example.com/">
+                    #PCDATA <span></span>
+                 </del>
+             </span>
+             <div>
+                 <ins cite="http://www.example.com/">
+                    #PCDATA <div></div> <span></span>
+                 </ins>
+                 <del cite="http://www.example.com/">
+                    #PCDATA <div></div> <span></span>
+                 </del>
+             </div>'
+        );
+        
+        // inline removal
+        $this->assertResult(
+            '<span>
+                 <ins><div></div></ins>
+                 <del><div></div></del>
+             </span>',
+             '<span>
+                 <ins></ins>
+                 <del></del>
+             </span>'
+        );
+        
+        // unsupported attributes
+        $this->assertResult(
+            '<ins
+                datetime="1994-11-05T13:15:30Z"
+            ></ins>
+            <del
+                datetime="1994-11-05T13:15:30Z"
+            ></del>',
+            '<ins></ins>
+            <del></del>'
+        );
+        
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModule/HypertextTest.php b/tests/HTMLPurifier/HTMLModule/HypertextTest.php
new file mode 100644
index 00000000..41d364dc
--- /dev/null
+++ b/tests/HTMLPurifier/HTMLModule/HypertextTest.php
@@ -0,0 +1,52 @@
+<?php
+
+require_once 'HTMLPurifier/HTMLModuleHarness.php';
+
+class HTMLPurifier_HTMLModule_HypertextTest extends HTMLPurifier_HTMLModuleHarness
+{
+    
+    function test() {
+        
+        // max
+        $this->assertResult(
+            '<span>
+                 <a
+                    href="http://www.example.com/"
+                    rel="nofollow"
+                    rev="index"
+                 >
+                    #PCDATA <span>Inline</span>
+                 </a>
+             </span>', true, array(
+                'Attr.AllowedRel' => 'nofollow',
+                'Attr.AllowedRev' => 'index'
+             )
+        );
+        
+        // invalid children
+        $this->assertResult(
+            '<a>Text<span><a></a></span><div></div><a></a></a>',
+            '<a>Text<span></span></a>'
+        );
+        
+        // unsupported attributes
+        $this->assertResult(
+            '<a
+                charset="utf-8"
+                type="text/html"
+                hreflang="en"
+                accesskey="f"
+                shape="rect"
+                coords="0,0,20,0"
+                tabindex="3"
+                onfocus="foo();"
+                onblur="bar();"
+             ></a>',
+             '<a></a>'
+        );
+        
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModule/ImageTest.php b/tests/HTMLPurifier/HTMLModule/ImageTest.php
new file mode 100644
index 00000000..3156af8a
--- /dev/null
+++ b/tests/HTMLPurifier/HTMLModule/ImageTest.php
@@ -0,0 +1,50 @@
+<?php
+
+require_once 'HTMLPurifier/HTMLModuleHarness.php';
+
+class HTMLPurifier_HTMLModule_ImageTest extends HTMLPurifier_HTMLModuleHarness
+{
+    
+    function test() {
+        
+        // max
+        $this->assertResult(
+            '<span>
+                 <img
+                    src="example.png"
+                    alt="Example image"
+                    longdesc="example.description.txt"
+                    height="42"
+                    width="42"
+                 />
+             </span>'
+        );
+        
+        // required attributes
+        $this->assertResult(
+            '<img src="foo.png" />',
+            '<img src="foo.png" alt="foo.png" />'
+        );
+        
+        // empty
+        $this->assertResult(
+            '<img src="foo.png" alt="foo">',
+            '<img src="foo.png" alt="foo" />'
+        );
+        
+        // unsupported attributes
+        $this->assertResult(
+            '<img
+                src="example.png"
+                alt="Example"
+                usemap="#foo"
+                ismap="ismap"
+             />',
+             '<img src="example.png" alt="Example" />'
+        );
+        
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/tests/HTMLPurifier/HTMLModule/LegacyTest.php b/tests/HTMLPurifier/HTMLModule/LegacyTest.php
new file mode 100644
index 00000000..8d345552
--- /dev/null
+++ b/tests/HTMLPurifier/HTMLModule/LegacyTest.php
@@ -0,0 +1,32 @@
+<?php
+
+require_once 'HTMLPurifier/HTMLModuleHarness.php';
+
+class HTMLPurifier_HTMLModule_LegacyTest extends HTMLPurifier_HTMLModuleHarness
+{
+    
+    function test() {
+        
+        // max
+        $this->assertResult(
+            '<span>
+                <u>Text<span></span></u>
+                <s>Text<span></span></s>
+                <strike>Text<span></span></strike>
+            </span>'
+        );
+        
+        // redefinitions
+        /*$this->assertResult(
+            '<ol start="3">
+                <li value="2">Foo</li>
+            </ol>
+            <address>Text<span></span><p></p></address>
+            <blockquote>Text<span></span><div></div></blockquote>'
+        );*/
+        
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/tests/test_files.php b/tests/test_files.php
index 0f989c75..d0ec5089 100644
--- a/tests/test_files.php
+++ b/tests/test_files.php
@@ -63,6 +63,10 @@ $test_files[] = 'GeneratorTest.php';
 $test_files[] = 'HTMLModuleManagerTest.php';
 $test_files[] = 'HTMLModuleTest.php';
 $test_files[] = 'HTMLModule/BdoTest.php';
+$test_files[] = 'HTMLModule/EditTest.php';
+$test_files[] = 'HTMLModule/HypertextTest.php';
+$test_files[] = 'HTMLModule/ImageTest.php';
+$test_files[] = 'HTMLModule/LegacyTest.php';
 $test_files[] = 'IDAccumulatorTest.php';
 $test_files[] = 'LanguageFactoryTest.php';
 $test_files[] = 'LanguageTest.php';