Fix broken test cases
diff --git a/bundles/org.eclipse.orion.client.javascript/web/js-tests/contentAssistTests.html b/bundles/org.eclipse.orion.client.javascript/web/js-tests/contentAssistTests.html
index 68d3c9b..c7686d0 100644
--- a/bundles/org.eclipse.orion.client.javascript/web/js-tests/contentAssistTests.html
+++ b/bundles/org.eclipse.orion.client.javascript/web/js-tests/contentAssistTests.html
@@ -7,16 +7,17 @@
 	<script>
 		/*global window require */
 		require({
-		  baseUrl: '../..',
+		  baseUrl: '../',
 		  paths: {
 				"scriptedLogger": 'javascript/esprima/scriptedLogger',
 				text: 'requirejs/text',
 				i18n: 'requirejs/i18n',
-				domReady: 'requirejs/domReady'	    
+				domReady: 'requirejs/domReady',
+				esprima: 'esprima/esprima'
 		  }
 		});
 		window.onload = function() {
-			require(['orion/test','js-tests/contentAssistTests'], 
+			require(['orion/test','js-tests/contentAssistTests'],
 				function(test, jsTests) {
 					test.run(jsTests);
 				});
diff --git a/bundles/org.eclipse.orion.client.javascript/web/js-tests/indexFileParsingTests.html b/bundles/org.eclipse.orion.client.javascript/web/js-tests/indexFileParsingTests.html
index 1105b6a..00c0123 100644
--- a/bundles/org.eclipse.orion.client.javascript/web/js-tests/indexFileParsingTests.html
+++ b/bundles/org.eclipse.orion.client.javascript/web/js-tests/indexFileParsingTests.html
@@ -7,16 +7,16 @@
 	<script>
 		/*global window require */
 		require({
-		  baseUrl: '../..',
+		  baseUrl: '../',
 		  paths: {
 				"scriptedLogger": 'javascript/esprima/scriptedLogger',
 				text: 'requirejs/text',
 				i18n: 'requirejs/i18n',
-				domReady: 'requirejs/domReady'	    
+				domReady: 'requirejs/domReady'
 		  }
 		});
 		window.onload = function() {
-			require(['orion/test','js-tests/indexFileParsingTests'], 
+			require(['orion/test','js-tests/indexFileParsingTests'],
 				function(test, jsTests) {
 					test.run(jsTests);
 				});
diff --git a/bundles/org.eclipse.orion.client.ui/web/js-tests/jsTestSuite.js b/bundles/org.eclipse.orion.client.ui/web/js-tests/jsTestSuite.js
index adb9483..6727c48 100644
--- a/bundles/org.eclipse.orion.client.ui/web/js-tests/jsTestSuite.js
+++ b/bundles/org.eclipse.orion.client.ui/web/js-tests/jsTestSuite.js
@@ -2,10 +2,10 @@
  * @license
  * Copyright (c) 2012 IBM Corporation and others.
  * Copyright (c) 2012 VMware, Inc.
- * All rights reserved. This program and the accompanying materials are made 
- * available under the terms of the Eclipse Public License v1.0 
- * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
- * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0
+ * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
+ * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
@@ -107,6 +107,10 @@
 OrionTestCase("ast", "/js-tests/astManager/astManagerTests.html");
 OrionTestCase("commands", "/js-tests/commands/test.html");
 OrionTestCase("editDispatcher", "/js-tests/dispatcher/editDispatcherTests.html");
+
+// These live in the javascript bundle
+OrionTestCase("esprima-content-assist", "/js-tests/contentAssistTests.html");
+OrionTestCase("index-file-parsing", "/js-tests/indexFileParsingTests.html");
 OrionTestCase("nodeJsEvents", "/js-tests/events/test.html");
 
 //OrionTestCase("searchRendering", "/js-tests/searchRendering/test.html");