diff --git a/tests/deps.js b/tests/deps.js
index 78e9e5d..f2de139 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -1,11 +1,11 @@
 // This file was autogenerated by /home/ubuntu/Dev/projects/nclosure/third_party/closure-library/closure/bin/build/depswriter.py.
 // Please do not edit.
-goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/checkAllSampleTestsPassing.js', ['nclosure_tests.checkAllSampleTestsPassing'], ['goog.array', 'goog.testing.AsyncTestCase', 'goog.testing.jsunit', 'nclosure.tests']);
+goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/checkAllSampleTestsPassing.js', ['nclosure_tests.checkAllSampleTestsPassing'], ['goog.array', 'goog.testing.AsyncTestCase', 'goog.testing.jsunit', 'nclosure.tests.utils']);
 goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/checkAllSamplesAreRunningTests.js', [], ['goog.array', 'goog.testing.AsyncTestCase', 'goog.testing.jsunit']);
 goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/compileAndCheckFilesTests.js', [], ['goog.array', 'goog.testing.AsyncTestCase', 'goog.testing.jsunit']);
 goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/compilerCommandLineArgsTests.js', [], ['goog.testing.AsyncTestCase', 'goog.testing.jsunit']);
 goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/docFrameworkTests.js', [], ['goog.array', 'goog.testing.AsyncTestCase', 'goog.testing.jsunit']);
 goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/googNodeTestFrameworkTests.js', [], ['goog.array', 'goog.testing.jsunit', 'nclosure.settingsLoader']);
-goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/runClosureLibraryJSUnitsManual.js', [], ['goog.testing.jsunit', 'nclosure.tests']);
+goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/runClosureLibraryJSUnitsManual.js', [], ['goog.testing.jsunit', 'nclosure.tests.utils']);
 goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/settingsLoaderTests.js', [], ['goog.testing.jsunit', 'nclosure.settingsLoader']);
-goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/utils.js', ['nclosure.tests'], ['goog.array', 'nclosure']);
+goog.addDependency('/home/ubuntu/Dev/projects/nclosure/tests/utils.js', ['nclosure.tests.utils'], ['goog.array', 'nclosure']);
diff --git a/tests/runClosureLibraryJSUnitsManual.js b/tests/runClosureLibraryJSUnitsManual.js
index 0936b9e..165560c 100755
--- a/tests/runClosureLibraryJSUnitsManual.js
+++ b/tests/runClosureLibraryJSUnitsManual.js
@@ -9,7 +9,7 @@ var ng_ = require('nclosure').nclosure();
 
 goog.require('goog.testing.jsunit');
 
-goog.require('nclosure.tests');
+goog.require('nclosure.tests.utils');
 
 var fs_ = require('fs');
 
@@ -25,7 +25,7 @@ var start = Date.now();
 function setUpPage() {
   // TODO: This assumes the nctest command is running in
   // the nclosure directory.
-  allTestFiles = nclosure.tests.readDirRecursiveSync
+  allTestFiles = nclosure.tests.utils.readDirRecursiveSync
     ('third_party/closure-library/closure/goog/', '_test[\d\w_]*\.(html|js)');
   if (maxTests > 0 && maxTests < allTestFiles.length)
      allTestFiles = allTestFiles.slice(0, maxTests);
@@ -55,7 +55,7 @@ function testClousreTests() {
 
     var commands = goog.array.map(allFilesInTmp,
       function(f) { return 'nctest ' + ng_.getPath(tmpdir, f); });
-    nclosure.tests.paralleliseExecs(
+    nclosure.tests.utils.paralleliseExecs(
       commands,runTestCallback_, onCompleted_, maxParallels);
   });
 };
@@ -66,8 +66,8 @@ function copyAndParseAllTestFiles(oncomplete) {
     if (err) return oncomplete(err);
     copyAndParseAllTestFilesImpl(oncomplete)
   };
-  if (fs_.existsSync(tmpdir)) {
-    nclosure.tests.rmRfDir(tmpdir, function(err) {
+  if (path_.existsSync(tmpdir)) {
+    nclosure.tests.utils.rmRfDir(tmpdir, function(err) {
       if (err) return oncomplete(err);
       fs_.mkdir(tmpdir, 0777, impl);
     });