diff --git a/HTML_Purifier.php b/HTML_Purifier.php
index 7b4a7aa6..895d5cba 100644
--- a/HTML_Purifier.php
+++ b/HTML_Purifier.php
@@ -3,7 +3,23 @@
 class HTML_Purifier
 {
     
+    var $lexer;
+    var $definition;
+    var $generator;
     
+    function HTML_Purifier() {
+        $this->lexer = new HTML_Lexer();
+        $this->definition = new PureHTMLDefinition();
+        $this->generator = new HTML_Generator();
+    }
+    
+    function purify($html) {
+        
+        $tokens = $this->lexer->tokenizeHTML($html);
+        $tokens = $this->definition->purifyTokens($tokens);
+        return $this->generator->generateFromTokens($tokens);
+        
+    }
     
 }
 
diff --git a/tests/HTML_Generator.php b/tests/HTML_Generator.php
index 30be843e..56500d7b 100644
--- a/tests/HTML_Generator.php
+++ b/tests/HTML_Generator.php
@@ -1,11 +1,11 @@
 <?php
 
-class UnitTest_HTML_Generator extends UnitTestCase
+class Test_HTML_Generator extends UnitTestCase
 {
     
     var $gen;
     
-    function UnitTest_HTML_Generator() {
+    function Test_HTML_Generator() {
         $this->UnitTestCase();
         $this->gen = new HTML_Generator();
     }
diff --git a/tests/HTML_Lexer.php b/tests/HTML_Lexer.php
index eb9f68f9..075aa3e9 100644
--- a/tests/HTML_Lexer.php
+++ b/tests/HTML_Lexer.php
@@ -4,7 +4,7 @@
     * Benchmark the SAX parser with my homemade one
  */
 
-class TestCase_HTML_Lexer extends UnitTestCase
+class Test_HTML_Lexer extends UnitTestCase
 {
     
     var $HTML_Lexer;
diff --git a/tests/HTML_Purifier.php b/tests/HTML_Purifier.php
index 1d4bbb93..a5383c39 100644
--- a/tests/HTML_Purifier.php
+++ b/tests/HTML_Purifier.php
@@ -1,9 +1,13 @@
 <?php
 
-class TestCase_HTML_Purifier extends UnitTestCase
+class Test_HTML_Purifier extends UnitTestCase
 {
     
-    
+    function Test_HTML_Purifier() {
+        
+        
+        
+    }
     
 }
 
diff --git a/tests/PureHTMLDefinition.php b/tests/PureHTMLDefinition.php
index 5e7d27c2..39297798 100644
--- a/tests/PureHTMLDefinition.php
+++ b/tests/PureHTMLDefinition.php
@@ -1,11 +1,11 @@
 <?php
 
-class UnitTest_PureHTMLDefinition extends UnitTestCase
+class Test_PureHTMLDefinition extends UnitTestCase
 {
     
     var $def;
     
-    function UnitTest_PureHTMLDefinition() {
+    function Test_PureHTMLDefinition() {
         $this->UnitTestCase();
         $this->def = new PureHTMLDefinition();
         $this->def->loadData();