diff --git a/lib/server.js b/lib/server.js
index 31289fbe..838f0b34 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -2,8 +2,8 @@
 	var Gun = require('../gun');
 	Gun.serve = require('./serve');
 	require('./s3');
-	//require('./uws');
-	require('./wsp/server');
+	require('./uws');
+	//require('./wsp/server');
 	require('./file');
 	module.exports = Gun;
 }());
\ No newline at end of file
diff --git a/package.json b/package.json
index 896017ee..065f83c3 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
   "dependencies": {
     "aws-sdk": "~>2.15.0",
     "formidable": "~>1.0.15",
-    "ws": "~>2.1.0",
     "uws": "~>0.13.0"
   },
   "devDependencies": {
diff --git a/test/common.js b/test/common.js
index 70a20c4a..fc362e94 100644
--- a/test/common.js
+++ b/test/common.js
@@ -3,7 +3,16 @@ var root;
 	root = env.window? env.window : global;
 	env.window && root.localStorage && root.localStorage.clear();
 	//root.Gun = root.Gun || require('../gun');
-	root.Gun = root.Gun || require('../index');
+	if(root.Gun){
+		root.Gun = root.Gun;
+	} else {
+		root.Gun = require('../gun');
+		Gun.serve = require('./serve');
+		//require('./s3');
+		//require('./uws');
+		//require('./wsp/server');
+		require('./file');
+	}
 }(this));
 //Gun.log.squelch = true;
 var gleak = {globals: {}, check: function(){ // via tobyho