diff --git a/library/HTMLPurifier/HTMLDefinition.php b/library/HTMLPurifier/HTMLDefinition.php
index aaeb8bae..fe6bd141 100644
--- a/library/HTMLPurifier/HTMLDefinition.php
+++ b/library/HTMLPurifier/HTMLDefinition.php
@@ -330,7 +330,7 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
         if (isset($this->info_content_sets['Block'][$block_wrapper])) {
             $this->info_block_wrapper = $block_wrapper;
         } else {
-            trigger_error('Cannot use non-block element as block wrapper.',
+            trigger_error('Cannot use non-block element as block wrapper',
                 E_USER_ERROR);
         }
         
@@ -340,7 +340,7 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
             $this->info_parent = $parent;
             $this->info_parent_def = $def;
         } else {
-            trigger_error('Cannot use unrecognized element as parent.',
+            trigger_error('Cannot use unrecognized element as parent',
                 E_USER_ERROR);
             $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
         }
diff --git a/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php b/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
index 788c7a36..256d3a34 100644
--- a/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
+++ b/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
@@ -74,6 +74,7 @@ extends HTMLPurifier_ChildDefHarness
     }
     
     function testError() {
+        $this->expectError('Cannot use non-block element as block wrapper');
         $this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div | p');
         $this->config->set('HTML', 'BlockWrapper', 'dav');
         $this->assertResult('Needs wrap', '<p>Needs wrap</p>');
diff --git a/tests/HTMLPurifier/ChildDef/TableTest.php b/tests/HTMLPurifier/ChildDef/TableTest.php
index 209e2a57..62247d23 100644
--- a/tests/HTMLPurifier/ChildDef/TableTest.php
+++ b/tests/HTMLPurifier/ChildDef/TableTest.php
@@ -3,6 +3,9 @@
 require_once 'HTMLPurifier/ChildDefHarness.php';
 require_once 'HTMLPurifier/ChildDef/Table.php';
 
+// we're using empty tags to compact the tests: under real circumstances
+// there would be contents in them
+
 class HTMLPurifier_ChildDef_TableTest extends HTMLPurifier_ChildDefHarness
 {
     
@@ -11,40 +14,47 @@ class HTMLPurifier_ChildDef_TableTest extends HTMLPurifier_ChildDefHarness
         $this->obj = new HTMLPurifier_ChildDef_Table();
     }
     
-    function test() {
+    function testEmptyInput() {
         $this->assertResult('', false);
-        
-        // we're using empty tags to compact the tests: under real circumstances
-        // there would be contents in them
-        
+    }
+    
+    function testSingleRow() {
         $this->assertResult('<tr />');
+    }
+    
+    function testComplexContents() {
         $this->assertResult('<caption /><col /><thead /><tfoot /><tbody>'.
             '<tr><td>asdf</td></tr></tbody>');
         $this->assertResult('<col /><col /><col /><tr />');
-        
-        // mixed up order
+    }
+    
+    function testReorderContents() {
         $this->assertResult(
           '<col /><colgroup /><tbody /><tfoot /><thead /><tr>1</tr><caption /><tr />',
           '<caption /><col /><colgroup /><thead /><tfoot /><tbody /><tr>1</tr><tr />');
-        
-        // duplicates of singles
-        // - first caption serves
-        // - trailing tfoots/theads get turned into tbodys
+    }
+    
+    function testDuplicateProcessing() {
         $this->assertResult(
           '<caption>1</caption><caption /><tbody /><tbody /><tfoot>1</tfoot><tfoot />',
           '<caption>1</caption><tfoot>1</tfoot><tbody /><tbody /><tbody />'
         );
-        
-        // errant text dropped (until bubbling is implemented)
+    }
+    
+    function testRemoveText() {
         $this->assertResult('foo', false);
-        
-        // whitespace sticks to the previous element, last whitespace is
-        // stationary
-        $this->assertResult("\n   <tr />\n  <tr />\n ", true, array('Output.Newline' => "\n"));
+    }
+    
+    function testStickyWhitespaceOnTr() {
+        $this->config->set('Output', 'Newline', "\n");
+        $this->assertResult("\n   <tr />\n  <tr />\n ");
+    }
+    
+    function testStickyWhitespaceOnTSection() {
+        $this->config->set('Output', 'Newline', "\n");
         $this->assertResult(
           "\n\t<tbody />\n\t\t<tfoot />\n\t\t\t",
-          "\n\t\t<tfoot />\n\t<tbody />\n\t\t\t",
-          array('Output.Newline' => "\n")
+          "\n\t\t<tfoot />\n\t<tbody />\n\t\t\t"
         );
         
     }
diff --git a/tests/HTMLPurifier/HTMLModule/ScriptingTest.php b/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
index 2bb4a0e8..7f4151fd 100644
--- a/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
+++ b/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
@@ -5,47 +5,51 @@ require_once 'HTMLPurifier/HTMLModuleHarness.php';
 class HTMLPurifier_HTMLModule_ScriptingTest extends HTMLPurifier_HTMLModuleHarness
 {
     
-    function test() {
-        
-        // default (remove everything)
+    function setUp() {
+        parent::setUp();
+        $this->config->set('HTML', 'Trusted', true);
+        $this->config->set('Core', 'CommentScriptContents', false);
+    }
+    
+    function testDefaultRemoval() {
+        $this->config->set('HTML', 'Trusted', false);
         $this->assertResult(
             '<script type="text/javascript">foo();</script>', ''
         );
-        
-        // enabled
+    }
+    
+    function testPreserve() {
         $this->assertResult(
-            '<script type="text/javascript">foo();</script>', true,
-            array('HTML.Trusted' => true)
+            '<script type="text/javascript">foo();</script>'
         );
-        
-        // CDATA
+    }
+    
+    function testCDATAEnclosure() {
         $this->assertResult(
-'//<![CDATA[
+'<script type="text/javascript">//<![CDATA[
 alert("<This is compatible with XHTML>");
-//]]> ', true,
-            array('HTML.Trusted' => true)
+//]]></script>'
         );
-        
-        // max
+    }
+    
+    function testAllAttributes() {
         $this->assertResult(
             '<script
                 defer="defer"
                 src="test.js"
                 type="text/javascript"
-            >PCDATA</script>', true,
-            array('HTML.Trusted' => true, 'Core.CommentScriptContents' => false)
+            >PCDATA</script>'
         );
-        
-        // unsupported
+    }
+    
+    function testUnsupportedAttributes() {
         $this->assertResult(
             '<script
                 type="text/javascript"
                 charset="utf-8"
             >PCDATA</script>',
-            '<script type="text/javascript">PCDATA</script>',
-            array('HTML.Trusted' => true, 'Core.CommentScriptContents' => false)
+            '<script type="text/javascript">PCDATA</script>'
         );
-        
     }
     
 }