diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1102a4528..fdd36afb9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AnalysisUIOptions">
+    <option name="SCOPE_TYPE" value="8" />
+    <option name="CUSTOM_SCOPE_NAME" value="Calipso" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="f7c3b02a-4dab-496d-8aef-8910c0c90b78" name="Default" comment="" />
     <ignored path="calipso.iws" />
@@ -24,9 +28,7 @@
         <entry file="file://$PROJECT_DIR$/modules/core/admin/admin.js">
           <provider selected="true" editor-type-id="text-editor">
             <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-              </folding>
+              <folding />
             </state>
           </provider>
         </entry>
@@ -49,19 +51,46 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
+      <file leaf-file-name="app.js" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="58" column="48" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.0">
+            <state line="345" column="8" selection-start="11132" selection-end="11132" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="app.js" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app.js">
+      <file leaf-file-name="jasmine-1.1.0.js" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/jasmine-1.1.0.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="134" column="15" selection-start="3357" selection-end="3357" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="nodeunit-intellij-starter.js" pinned="false" current="false" current-in-tab="false">
+        <entry file="file:///private/var/folders/9p/nts3rwvx1bd8jtvn4jq5bvxw0000gn/T/nodeunit-intellij-starter.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="364" column="31" selection-start="12814" selection-end="12814" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="lib.calipso.js" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/lib.calipso.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="5" column="4" selection-start="130" selection-end="130" vertical-scroll-proportion="0.14478764">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="config.test.js" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/config.test.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="100" column="35" selection-start="2765" selection-end="2765" vertical-scroll-proportion="-5.4414225">
+            <state line="18" column="0" selection-start="520" selection-end="520" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -92,10 +121,14 @@
       <list>
         <option value="$PROJECT_DIR$/conf/development.json" />
         <option value="$PROJECT_DIR$/modules/core/user/user.js" />
-        <option value="$PROJECT_DIR$/test/lib.calipso.js" />
         <option value="$PROJECT_DIR$/lib/core/Configuration.js" />
         <option value="$PROJECT_DIR$/logo.js" />
         <option value="$PROJECT_DIR$/app.js" />
+        <option value="$PROJECT_DIR$/testConfig.yaml" />
+        <option value="$PROJECT_DIR$/jsTestDriver.conf" />
+        <option value="/private/var/folders/9p/nts3rwvx1bd8jtvn4jq5bvxw0000gn/T/nodeunit-intellij-starter.js" />
+        <option value="$PROJECT_DIR$/test/lib.calipso.js" />
+        <option value="$PROJECT_DIR$/test/config.test.js" />
       </list>
     </option>
   </component>
@@ -174,6 +207,20 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calipso" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calipso" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="calipso" />
@@ -272,15 +319,53 @@
   <component name="PropertiesComponent">
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="recentsLimit" value="5" />
     <property name="options.lastSelected" value="project.propVCSSupport.VCSs.Git" />
+    <property name="recentsLimit" value="5" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/node_modules/mocha/bin/_mocha" />
     <property name="restartRequiresConfirmation" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/app.js" />
-    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="FullScreen" value="false" />
     <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+  </component>
+  <component name="PublishConfig">
+    <servers>
+      <server id="8f389bb1-8dfd-439f-8968-626ebb177e75">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" />
+          </mappings>
+        </serverdata>
+      </server>
+    </servers>
   </component>
-  <component name="RunManager" selected="Node.js.Calipso">
-    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="/usr/local/bin/node" path-to-js-file="app.js" working-dir="$PROJECT_DIR$">
+  <component name="RunManager" selected="Node.js.Calipso Tests">
+    <configuration default="false" name="jsTestDriver.conf" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver" temporary="true">
+      <setting name="configLocationType" value="CONFIG_FILE" />
+      <setting name="settingsFile" value="$PROJECT_DIR$/jsTestDriver.conf" />
+      <setting name="serverType" value="INTERNAL" />
+      <setting name="preferredDebugBrowser" value="CHROME" />
+      <RunnerSettings RunnerId="JsTestDriverClientRunner" />
+      <ConfigurationWrapper RunnerId="JsTestDriverClientRunner" />
+      <method />
+    </configuration>
+    <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
+      <setting name="configLocationType" value="CONFIG_FILE" />
+      <setting name="settingsFile" value="" />
+      <setting name="serverType" value="INTERNAL" />
+      <setting name="preferredDebugBrowser" value="CHROME" />
+      <method />
+    </configuration>
+    <configuration default="true" type="NodeunitConfigurationType" factoryName="Nodeunit">
+      <setting name="nodePath" value="/usr/local/bin/node" />
+      <envs />
+      <setting name="passParentEnvVars" value="true" />
+      <setting name="nodeunitModuleDir" value="" />
+      <setting name="workingDirectory" value="$PROJECT_DIR$" />
+      <setting name="testType" value="DIRECTORY" />
+      <setting name="directory" value="test" />
+      <method />
+    </configuration>
+    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="/usr/local/bin/node" path-to-js-file="app.js" working-dir="$PROJECT_DIR$" coffeescript-run="false">
       <method />
     </configuration>
     <configuration default="false" name="Calipso" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="/usr/local/bin/node" path-to-js-file="app.js" working-dir="$PROJECT_DIR$">
@@ -290,9 +375,36 @@
       <ConfigurationWrapper RunnerId="NodeJS.run" />
       <method />
     </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Node.js.Calipso" />
+    <configuration default="false" name="Calipso Tests" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="/usr/local/bin/node" path-to-js-file="node_modules/mocha/bin/_mocha" working-dir="$PROJECT_DIR$">
+      <RunnerSettings RunnerId="NodeJS.run" />
+      <ConfigurationWrapper RunnerId="NodeJS.run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="Calipso" type="NodeunitConfigurationType" factoryName="Nodeunit">
+      <setting name="nodePath" value="/usr/local/bin/node" />
+      <envs />
+      <setting name="passParentEnvVars" value="true" />
+      <setting name="nodeunitModuleDir" value="$PROJECT_DIR$/node_modules/nodeunit" />
+      <setting name="workingDirectory" value="$PROJECT_DIR$" />
+      <setting name="testType" value="DIRECTORY" />
+      <setting name="directory" value="test" />
+      <RunnerSettings RunnerId="Nodeunit.debug" />
+      <RunnerSettings RunnerId="Nodeunit.run" />
+      <ConfigurationWrapper RunnerId="Nodeunit.debug" />
+      <ConfigurationWrapper RunnerId="Nodeunit.run" />
+      <method />
+    </configuration>
+    <list size="4">
+      <item index="0" class="java.lang.String" itemvalue="JsTestDriver.jsTestDriver.conf" />
+      <item index="1" class="java.lang.String" itemvalue="Node.js.Calipso" />
+      <item index="2" class="java.lang.String" itemvalue="Node.js.Calipso Tests" />
+      <item index="3" class="java.lang.String" itemvalue="Nodeunit.Calipso" />
     </list>
+    <recent_temporary>
+      <list size="1">
+        <item index="0" class="java.lang.String" itemvalue="JsTestDriver.jsTestDriver.conf" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
   <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false">
@@ -343,18 +455,19 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="75" y="22" width="1435" height="1005" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32918552" sideWeight="0.6062323" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32918552" sideWeight="0.49716714" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.60067874" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39932126" sideWeight="0.49150142" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39932126" sideWeight="0.48866856" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39932126" sideWeight="0.50354105" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32918552" sideWeight="0.49716714" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.38235295" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.67081445" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39932126" sideWeight="0.4780453" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39932126" sideWeight="0.48016998" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.23755656" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32918552" sideWeight="0.34560907" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32918552" sideWeight="0.64943343" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="JsTestDriver Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39932126" sideWeight="0.51203966" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -418,125 +531,104 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/modules/community/screenswiki/public/js/prettify/prettify.js">
+    <entry file="file://$PROJECT_DIR$/node_modules/jscoverage/tests/javascript.expected/javascript-with.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="29" column="233" selection-start="17417" selection-end="17417" vertical-scroll-proportion="0.7121535">
-          <folding />
-        </state>
+        <state line="25" column="0" selection-start="763" selection-end="763" vertical-scroll-proportion="0.6639511" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/hook.io/node_modules/socket.io-client/lib/vendor/web-socket-js/flash-src/com/hurlant/crypto/tls/BulkCiphers.as">
+    <entry file="file://$PROJECT_DIR$/node_modules/jade/testing/user.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="87" column="20" selection-start="3233" selection-end="3233" vertical-scroll-proportion="0.43568465">
-          <folding />
-        </state>
+        <state line="5" column="0" selection-start="204" selection-end="204" vertical-scroll-proportion="0.14880952" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/themes/core/cleanslate/public/sass/admin-menu.scss">
+    <entry file="file://$PROJECT_DIR$/node_modules/everyauth/node_modules/openid/openid.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="14" selection-start="177" selection-end="177" vertical-scroll-proportion="0.33195022">
-          <folding />
-        </state>
+        <state line="724" column="35" selection-start="17974" selection-end="17974" vertical-scroll-proportion="0.31771895" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/modules/community/screenswiki/public/js/jquery-1.4.4.min.js">
+    <entry file="file://$PROJECT_DIR$/node_modules/mysql/test/unit/legacy/test-parser.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="15" column="277" selection-start="644" selection-end="644" vertical-scroll-proportion="0.030549899">
-          <folding>
-            <marker date="1352057040000" expanded="false" signature="11499:11532" placeholder="..." />
-            <marker date="1352057040000" expanded="false" signature="13294:13304" placeholder="..." />
-            <marker date="1352057040000" expanded="false" signature="13394:13416" placeholder="..." />
-            <marker date="1352057040000" expanded="false" signature="75319:75412" placeholder="..." />
-            <marker date="1352057040000" expanded="false" signature="75445:75538" placeholder="..." />
-          </folding>
-        </state>
+        <state line="43" column="57" selection-start="1308" selection-end="1308" vertical-scroll-proportion="0.31746033" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/client/js/jquery-1.7.2.min.js">
+    <entry file="file://$PROJECT_DIR$/themes/downloaded/calipso/public/js/prettify/lang-apollo.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="2" column="17740" selection-start="50205" selection-end="50205" vertical-scroll-proportion="0.061099797">
-          <folding>
-            <marker date="1344288888000" expanded="false" signature="17421:17452" placeholder="..." />
-            <marker date="1344288888000" expanded="false" signature="20576:20586" placeholder="..." />
-          </folding>
-        </state>
+        <state line="1" column="441" selection-start="1018" selection-end="1018" vertical-scroll-proportion="0.030549899" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/jscoverage/tests/javascript.expected/javascript-with.js">
+    <entry file="file://$PROJECT_DIR$/modules/core/admin/admin.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="25" column="0" selection-start="763" selection-end="763" vertical-scroll-proportion="0.6639511">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/jade/testing/user.js">
+    <entry file="file://$PROJECT_DIR$/logo.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="0" selection-start="204" selection-end="204" vertical-scroll-proportion="0.14880952">
+        <state line="22" column="0" selection-start="611" selection-end="611" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/everyauth/node_modules/openid/openid.js">
+    <entry file="file://$PROJECT_DIR$/JasmineAdapter-1.1.2.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="724" column="35" selection-start="17974" selection-end="17974" vertical-scroll-proportion="0.31771895">
+        <state line="117" column="4" selection-start="2727" selection-end="2727" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/mysql/test/unit/legacy/test-parser.js">
+    <entry file="file://$PROJECT_DIR$/app-cluster.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="43" column="57" selection-start="1308" selection-end="1308" vertical-scroll-proportion="0.31746033">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/themes/downloaded/calipso/public/js/prettify/lang-apollo.js">
+    <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="441" selection-start="1018" selection-end="1018" vertical-scroll-proportion="0.030549899">
+        <state line="58" column="48" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/modules/core/admin/admin.js">
+    <entry file="file://$PROJECT_DIR$/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
+        <state line="345" column="8" selection-start="11132" selection-end="11132" vertical-scroll-proportion="0.0">
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/logo.js">
+    <entry file="file://$PROJECT_DIR$/jsTestDriver.conf">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="0" selection-start="611" selection-end="611" vertical-scroll-proportion="0.0">
+        <state line="15" column="0" selection-start="215" selection-end="215" vertical-scroll-proportion="0.3975265">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/JasmineAdapter-1.1.2.js">
+    <entry file="file://$PROJECT_DIR$/jasmine-1.1.0.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="117" column="4" selection-start="2727" selection-end="2727" vertical-scroll-proportion="0.0">
+        <state line="134" column="15" selection-start="3357" selection-end="3357" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app-cluster.js">
+    <entry file="file:///private/var/folders/9p/nts3rwvx1bd8jtvn4jq5bvxw0000gn/T/nodeunit-intellij-starter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="364" column="31" selection-start="12814" selection-end="12814" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
+    <entry file="file://$PROJECT_DIR$/test/config.test.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="48" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.0">
+        <state line="18" column="0" selection-start="520" selection-end="520" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app.js">
+    <entry file="file://$PROJECT_DIR$/test/lib.calipso.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="100" column="35" selection-start="2765" selection-end="2765" vertical-scroll-proportion="-5.4414225">
+        <state line="5" column="4" selection-start="130" selection-end="130" vertical-scroll-proportion="0.14478764">
           <folding />
         </state>
       </provider>
diff --git a/jsTestDriver.conf b/jsTestDriver.conf
new file mode 100644
index 000000000..4b5cd8678
--- /dev/null
+++ b/jsTestDriver.conf
@@ -0,0 +1,15 @@
+server: http://localhost:4224
+
+load:
+  - lib/*.js
+
+test:
+  - test/*.js
+
+plugin:
+ - name: "coverage"
+   jar: "lib/jstestdriver/coverage.jar"
+   module: "com.google.jstestdriver.coverage.CoverageModule"
+
+timeout: 90
+
diff --git a/test/config.test.js b/test/config.test.js
index a0450e5e4..c433c224c 100644
--- a/test/config.test.js
+++ b/test/config.test.js
@@ -14,85 +14,91 @@ var rootpath = process.cwd() + '/',
     Config = require('./helpers/require')('core/Configuration');
 
 var defaultConfig = {
-  "test":"test"
+    "test":"test"
 };
 
 /**
  * Tests
  */
-exports['I can create a development configuration'] = function() {
-
-  mkdir(path.join(rootpath,'tmp'), function() {
-    fs.writeFileSync(path.join(rootpath,'tmp','default.json'),JSON.stringify(defaultConfig));
-    var conf = new Config({env:'development',path:path.join(rootpath,'tmp')});
-    conf.type.should.equal('file');
-    conf.file.should.equal(path.join(rootpath,'tmp','development.json'));
-  });
+describe('Calipso config test', function () {
+    it('I can create a development configuration', function (done) {
+        mkdir(path.join(rootpath, 'tmp'), function () {
+            fs.writeFileSync(path.join(rootpath, 'tmp', 'default.json'), JSON.stringify(defaultConfig));
+            var conf = new Config({env:'development', path:path.join(rootpath, 'tmp')});
+            conf.type.should.equal('file');
+            conf.file.should.equal(path.join(rootpath, 'tmp', 'development.json'));
+            done();
+        });
+    });
 
-};
+    it('I can add and retrieve configuration', function (done) {
 
-exports['I can add and retrieve configuration'] = function() {
+        var conf = new Config({env:'development', path:path.join(rootpath, 'tmp')});
+        conf.init(function () {
+            conf.set('test:v1', 'v1');
+            conf.get('test:v1').should.equal('v1');
+            conf.set('test:v2', 'v2');
+            conf.get('test:v2').should.equal('v2');
 
-    var conf = new Config({env:'development',path:path.join(rootpath,'tmp')});
-    conf.init(function() {
-      conf.set('test:v1','v1');
-      conf.get('test:v1').should.equal('v1');
-      conf.set('test:v2','v2');
-      conf.get('test:v2').should.equal('v2');
-  
-      var test = conf.get('test');
-      test.v1.should.equal('v1');
-      test.v2.should.equal('v2');
+            var test = conf.get('test');
+            test.v1.should.equal('v1');
+            test.v2.should.equal('v2');
+            done();
+        });
     });
-};
-
-exports['I can use different environments'] = function() {
 
-    var confDev = new Config({env:'development',path:path.join(rootpath,'tmp')});
-    var confTest = new Config({env:'test',path:path.join(rootpath,'tmp')});
+    it('I can use different environments (dev config)', function (done) {
+        var confDev = new Config({env:'development', path:path.join(rootpath, 'tmp')});
 
-    confDev.init(function () {
-      confDev.set('test:v1','v1');
-      confDev.get('test:v1').should.equal('v1');
-      confDev.save(function(err) {
-          (fs.existsSync || path.existsSync)(confDev.file);
-      });
+        confDev.init(function () {
+            confDev.set('test:v1', 'v1');
+            confDev.get('test:v1').should.equal('v1');
+            confDev.save(function (err) {
+                (fs.existsSync || path.existsSync)(confDev.file);
+                done();
+            });
+        });
     });
-    confTest.init(function () {
-      confTest.set('test:v1','v1');
-      confTest.get('test:v1').should.equal('v1');
-      confTest.save(function(err) {
-          (fs.existsSync || path.existsSync)(confTest.file);
-      });
+    it('I can use different environments (test config)', function (done) {
+        var confTest = new Config({env:'test', path:path.join(rootpath, 'tmp')});
+        confTest.init(function () {
+            confTest.set('test:v1', 'v1');
+            confTest.get('test:v1').should.equal('v1');
+            confTest.save(function (err) {
+                (fs.existsSync || path.existsSync)(confTest.file);
+                done();
+            });
+        });
     });
-};
 
-exports['I can use the setSave shortcut'] = function() {
+    it('I can use the setSave shortcut', function (done) {
 
-    var conf = new Config({path:path.join(rootpath,'tmp')});
-    conf.init(function () {
-      conf.setSave('test:setsave','Yah!',function(err) {
-          var confTest = new Config({path:path.join(rootpath,'tmp')});
-          confTest.init(function () {
-            confTest.get('test:setsave').should.equal('Yah!');
-          });
-      });
+        var conf = new Config({path:path.join(rootpath, 'tmp')});
+        conf.init(function () {
+            conf.setSave('test:setsave', 'Yah!', function (err) {
+                var confTest = new Config({path:path.join(rootpath, 'tmp')});
+                confTest.init(function () {
+                    confTest.get('test:setsave').should.equal('Yah!');
+                    done();
+                });
+            });
+        });
     });
-};
 
 
-/**
- * Mkdir -p.
- *
- * TODO - these are unix only ...
- *
- * @param {String} path
- * @param {Function} fn
- */
+    /**
+     * Mkdir -p.
+     *
+     * TODO - these are unix only ...
+     *
+     * @param {String} path
+     * @param {Function} fn
+     */
 
-function mkdir(path, fn) {
-  exec('mkdir -p ' + path, function(err){
-    if (err) throw err;
-    fn && fn();
-  });
-}
+    function mkdir(path, fn) {
+        exec('mkdir -p ' + path, function (err) {
+            if (err) throw err;
+            fn && fn();
+        });
+    }
+});
\ No newline at end of file
diff --git a/test/lib.calipso.js b/test/lib.calipso.js
index b89e7a13c..9ef769852 100644
--- a/test/lib.calipso.js
+++ b/test/lib.calipso.js
@@ -26,7 +26,7 @@ helper.finalize(function (err, calipsoHelper) {
   
       it('Calipso has loaded successfully', function(done) {
         calipso.loaded.should.equal(true);
-        calipso.modules.should.exist();
+        calipso.modules.should.exist;
         done();
       });