diff --git a/package.json b/package.json
index d2968fa..7026b2f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 , "dependencies": {
   }
 , "devDependencies": {
-    "simpleunit": "0.0.5",
+    "simpleunit": "0.0.6",
     "ajtalkjs-ajunit": "*"
   }
 }
\ No newline at end of file
diff --git a/test/test-base.js b/test/base.js
similarity index 100%
rename from test/test-base.js
rename to test/base.js
diff --git a/test/load.js b/test/load.js
index eea00fc..568fdf7 100644
--- a/test/load.js
+++ b/test/load.js
@@ -1,10 +1,37 @@
 
-var ajtalk = require('..'),
-    path = require('path');
+var ajtalk = require('../lib/ajtalk');
+var Smalltalk = ajtalk.Smalltalk;
+var path = require('path');
 
 exports['Load relative file'] = function (test) {
     var filename = path.join(__dirname, 'files', 'Load.st');
     ajtalk.load(filename);
     
     test.ok(ajtalk.Smalltalk.HtmlHelloPage);
-}
\ No newline at end of file
+}
+
+exports['Load Squeak Object'] = function(test) {
+	ajtalk.load(__dirname + '/../squeak/Object.st');
+
+	test.ok(Smalltalk.Object);
+};
+
+exports['Load Pharo Point'] = function(test) {
+	ajtalk.load(__dirname + '/../pharo/Point.st');
+
+	test.ok(Smalltalk.Point);
+};
+
+exports['Load Pharo Rectangle'] = function(test) {
+	ajtalk.load(__dirname + '/../pharo/Rectangle.st');
+
+	test.ok(Smalltalk.Point);
+};
+
+exports['Load Pharo Kernel Objects'] = function(test) {
+	ajtalk.load(__dirname + '/../pharo/KernelObjects.st');
+
+	test.ok(Smalltalk.ProtoObject);
+	test.ok(Smalltalk.Object);
+	test.ok(Smalltalk.Boolean);
+};
diff --git a/test/test-node.js b/test/node.js
similarity index 100%
rename from test/test-node.js
rename to test/node.js
diff --git a/test/test-number.js b/test/number.js
similarity index 100%
rename from test/test-number.js
rename to test/number.js
diff --git a/test/test-load.js b/test/test-load.js
deleted file mode 100644
index 8e7f234..0000000
--- a/test/test-load.js
+++ /dev/null
@@ -1,29 +0,0 @@
-
-var ajtalk = require('../lib/ajtalk');
-var Smalltalk = ajtalk.Smalltalk;
-
-exports['Load Squeak Object'] = function(test) {
-	ajtalk.load(__dirname + '/../squeak/Object.st');
-
-	test.ok(Smalltalk.Object);
-};
-
-exports['Load Pharo Point'] = function(test) {
-	ajtalk.load(__dirname + '/../pharo/Point.st');
-
-	test.ok(Smalltalk.Point);
-};
-
-exports['Load Pharo Rectangle'] = function(test) {
-	ajtalk.load(__dirname + '/../pharo/Rectangle.st');
-
-	test.ok(Smalltalk.Point);
-};
-
-exports['Load Pharo Kernel Objects'] = function(test) {
-	ajtalk.load(__dirname + '/../pharo/KernelObjects.st');
-
-	test.ok(Smalltalk.ProtoObject);
-	test.ok(Smalltalk.Object);
-	test.ok(Smalltalk.Boolean);
-};