 +
 +});
 +
++function undefine() {
++  delete define.modules['gclitest/index'];
++  delete define.modules['test/examiner'];
++  delete define.modules['gclitest/testTokenize'];
++  delete define.modules['test/assert'];
++  delete define.modules['gclitest/testSplit'];
++  delete define.modules['gclitest/commands'];
++  delete define.modules['gclitest/testCli'];
++  delete define.modules['gclitest/testHistory'];
++  delete define.modules['gclitest/testRequire'];
++  delete define.modules['gclitest/requirable'];
++
++  delete define.globalDomain.modules['gclitest/index'];
++  delete define.globalDomain.modules['test/examiner'];
++  delete define.globalDomain.modules['gclitest/testTokenize'];
++  delete define.globalDomain.modules['test/assert'];
++  delete define.globalDomain.modules['gclitest/testSplit'];
++  delete define.globalDomain.modules['gclitest/commands'];
++  delete define.globalDomain.modules['gclitest/testCli'];
++  delete define.globalDomain.modules['gclitest/testHistory'];
++  delete define.globalDomain.modules['gclitest/testRequire'];
++  delete define.globalDomain.modules['gclitest/requirable'];
++}
++
 +registerCleanupFunction(function() {
 +  Services.prefs.clearUserPref("devtools.gcli.enable");
-+
++  undefine();
 +  obj = undefined;
 +  define = undefined;
 +  console = undefined;

+
+function onLoad() {
+  browser.removeEventListener("DOMContentLoaded", onLoad, false);
+
+  try {
+    openConsole();
+    require("gclitest/index");
+  }
+  catch (ex) {
+    console.error('Test Failure', ex);
+  }
+  finally {
+    closeConsole();
+    finishTest();
+  }
+}

+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/index', ['require', 'exports', 'module' , 'gcli/index', 'test/examiner', 'gclitest/testTokenize', 'gclitest/testSplit', 'gclitest/testCli', 'gclitest/testHistory', 'gclitest/testRequire'], function(require, exports, module) {
+
+  // We need to make sure GCLI is initialized before we begin testing it
+  require('gcli/index');
+
+  var examiner = require('test/examiner');
+
