Index: tests/index.html
===================================================================
--- tests/index.html	(revision 604)
+++ tests/index.html	(working copy)
@@ -1,12 +1,12 @@
 <html>
 <head>
     <!-- This harness does not work locally in Safari -->
-    <script type="text/javascript" src="JSAN.js"></script>
+    <script type="text/javascript" src="../MochiKit/MochiKit.js"></script>
+    <script type="text/javascript" src="SimpleTest/TestRunner.js"></script>
 </head>
 <body>
 <script type="text/javascript">
-JSAN.use("Test.Harness.Browser");
-Test.Harness.Browser.runTests(
+TestRunner.runTests(
     'test_MochiKit-Async.html',
     'test_MochiKit-Base.html',
     'test_MochiKit-DateTime.html',
@@ -15,7 +15,8 @@
     'test_MochiKit-Iter.html',
     'test_MochiKit-Logging.html',
     'test_MochiKit-MochiKit.html',
-    'test_MochiKit-Color.html'
+    'test_MochiKit-Color.html',
+    'test_MochiKit-Signal.html'
 );
 </script>
 </body>
Index: tests/test_MochiKit-Async.html
===================================================================
--- tests/test_MochiKit-Async.html	(revision 604)
+++ tests/test_MochiKit-Async.html	(working copy)
@@ -1,9 +1,11 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/Async.js"></script>
+    <script type="text/javascript" src="../MochiKit/Iter.js"></script>
+    <script type="text/javascript" src="../MochiKit/DOM.js"></script>    
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
 
@@ -11,9 +13,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 35});
-
     var increment = function (res) {
         return res + 1;
     }
@@ -228,12 +227,11 @@
         is(originalTime, t, "argument passed in OK");
         is(arguments.length, 1, "argument count right");
         if (endtest) {
-            tx.endAsync(async);
+            SimpleTest.finish();
         }
         endtest++;
     };
-    var tx = new Test.Builder();
-    var async = tx.beginAsync(1000);
+    SimpleTest.waitForExplicitFinish();
     callLater(0.25, checkCallLater, t);
     wait(0.25, t).addCallback(checkCallLater);
     
Index: tests/test_MochiKit-Base.html
===================================================================
--- tests/test_MochiKit-Base.html	(revision 604)
+++ tests/test_MochiKit-Base.html	(working copy)
@@ -1,8 +1,10 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
+    <script type="text/javascript" src="../MochiKit/Iter.js"></script>
+    <script type="text/javascript" src="../MochiKit/DOM.js"></script>    
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
 
@@ -10,8 +12,6 @@
 <script type="text/javascript" src="test_Base.js"></script>
 <script type="text/javascript">
 try {
-    // Counting the number of tests is really lame
-    plan({'tests': 135});
     tests.test_Base({ok:ok,is:is});
     ok( true, "test suite finished!");
 } catch (err) {
Index: tests/test_MochiKit-Color.html
===================================================================
--- tests/test_MochiKit-Color.html	(revision 604)
+++ tests/test_MochiKit-Color.html	(working copy)
@@ -1,12 +1,12 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/Iter.js"></script>
     <script type="text/javascript" src="../MochiKit/DOM.js"></script>
     <script type="text/javascript" src="../MochiKit/Logging.js"></script>
     <script type="text/javascript" src="../MochiKit/Color.js"></script>
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
     <style type="text/css">.redtext {color: red}</style>
 </head>
 <body>
@@ -19,8 +19,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 80});
     var t = {ok:ok, is:is};
     tests.test_Color({ok:ok, is:is});
     is(
Index: tests/test_MochiKit-DOM.html
===================================================================
--- tests/test_MochiKit-DOM.html	(revision 604)
+++ tests/test_MochiKit-DOM.html	(working copy)
@@ -1,11 +1,11 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/MockDOM.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/Iter.js"></script>
     <script type="text/javascript" src="../MochiKit/DOM.js"></script>
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
 
@@ -30,8 +30,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 66});
 
     lst = [];
     o = {"blah": function () { lst.push("original"); }};
Index: tests/test_MochiKit-DateTime.html
===================================================================
--- tests/test_MochiKit-DateTime.html	(revision 604)
+++ tests/test_MochiKit-DateTime.html	(working copy)
@@ -1,9 +1,11 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/DateTime.js"></script>
+    <script type="text/javascript" src="../MochiKit/Iter.js"></script>
+    <script type="text/javascript" src="../MochiKit/DOM.js"></script>    
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
 
@@ -12,8 +14,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 22});
     tests.test_DateTime({ok:ok, is:is});
     ok( true, "test suite finished!");
     
Index: tests/test_MochiKit-Format.html
===================================================================
--- tests/test_MochiKit-Format.html	(revision 604)
+++ tests/test_MochiKit-Format.html	(working copy)
@@ -1,9 +1,11 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/Format.js"></script>
+    <script type="text/javascript" src="../MochiKit/Iter.js"></script>
+    <script type="text/javascript" src="../MochiKit/DOM.js"></script>    
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
 
@@ -12,8 +14,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 53});
     tests.test_Format({ok:ok, is:is});
     ok( true, "test suite finished!");
     
Index: tests/test_MochiKit-Iter.html
===================================================================
--- tests/test_MochiKit-Iter.html	(revision 604)
+++ tests/test_MochiKit-Iter.html	(working copy)
@@ -1,9 +1,10 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/Iter.js"></script>
+    <script type="text/javascript" src="../MochiKit/DOM.js"></script>    
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
 
@@ -12,8 +13,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 66});
     tests.test_Iter({ok:ok, is:is});
     ok( true, "test suite finished!");
     
Index: tests/test_MochiKit-Logging.html
===================================================================
--- tests/test_MochiKit-Logging.html	(revision 604)
+++ tests/test_MochiKit-Logging.html	(working copy)
@@ -1,9 +1,12 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/Logging.js"></script>
+    <script type="text/javascript" src="../MochiKit/Iter.js"></script>
+    <script type="text/javascript" src="../MochiKit/DOM.js"></script>    
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
+
 </head>
 <body>
 
@@ -12,8 +15,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 27});
     tests.test_Logging({ok:ok, is:is});
     ok( true, "test suite finished!");
     
Index: tests/test_MochiKit-MochiKit.html
===================================================================
--- tests/test_MochiKit-MochiKit.html	(revision 604)
+++ tests/test_MochiKit-MochiKit.html	(working copy)
@@ -1,15 +1,13 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/MochiKit.js"></script>
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
 
 <pre id="test">
 <script type="text/javascript">
-    // TODO: Make this a harness for the other tests
-    plan({"tests": 4});
     is( isUndefined(null), false, "null is not undefined" );
     is( isUndefined(""), false, "empty string is not undefined" );
     is( isUndefined(undefined), true, "undefined is undefined" );
Index: tests/test_MochiKit-Signal.html
===================================================================
--- tests/test_MochiKit-Signal.html	(revision 604)
+++ tests/test_MochiKit-Signal.html	(working copy)
@@ -1,11 +1,12 @@
 <html>
 <head>
-    <script type="text/javascript" src="Test/Builder.js"></script>
-    <script type="text/javascript" src="Test/More.js"></script>
     <script type="text/javascript" src="../MochiKit/Base.js"></script>
     <script type="text/javascript" src="../MochiKit/Iter.js"></script>
     <script type="text/javascript" src="../MochiKit/DOM.js"></script>
     <script type="text/javascript" src="../MochiKit/Signal.js"></script>    
+    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
+
 </head>
 <body>
 
@@ -16,8 +17,6 @@
 <script type="text/javascript">
 try {
         
-    // Counting the number of tests is really lame
-    plan({'tests': 51});
     tests.test_Signal({ok:ok, is:is});
     ok(true, "test suite finished!");
     


