diff --git a/README.md b/README.md
index 0392414d0..a7f04999c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
 SQL API for cartodb.com
 ========================
- 
+
 Provides a nodejs based API for running SQL queries against CartoDB.
 
-* Users are authenticated over OAuth. Also provides ability to make public
-  "SELECT" only calls.
-* OAuth requests to this API should always be made over SSL.
+* Users are authenticated over OAuth or via an API KEY.
+* Authenticated requests to this API should always be made over SSL.
 
 
 core requirements
diff --git a/test/README.md b/test/README.md
index 721c48535..9e1681988 100644
--- a/test/README.md
+++ b/test/README.md
@@ -13,7 +13,6 @@ Acceptance tests (need ctrl-C to exit)
 > expresso test/acceptance/app.auth.test.js
 
 
-Unit tests
-----------
-
-> expresso test/unit/psql.tests.js
\ No newline at end of file
+Unit tests (need ctrl-C to exit)
+--------------------------------
+> expresso test/unit/*.js (or run the tests individually)
\ No newline at end of file
diff --git a/test/oauth/oauth_test.py b/test/acceptance/oauth/oauth_test.py
similarity index 100%
rename from test/oauth/oauth_test.py
rename to test/acceptance/oauth/oauth_test.py
diff --git a/spike/app.js b/websocket_test/app.js
similarity index 95%
rename from spike/app.js
rename to websocket_test/app.js
index ab716552e..f731127ef 100644
--- a/spike/app.js
+++ b/websocket_test/app.js
@@ -1,3 +1,4 @@
+// this is a test to understand accessing sql api via websockets
 var express = require('express')
   , app     = express.createServer(
     express.logger({
diff --git a/spike/public/gmaps_mercator.js b/websocket_test/public/gmaps_mercator.js
similarity index 100%
rename from spike/public/gmaps_mercator.js
rename to websocket_test/public/gmaps_mercator.js
diff --git a/spike/public/index.html b/websocket_test/public/index.html
similarity index 100%
rename from spike/public/index.html
rename to websocket_test/public/index.html
diff --git a/spike/public/map.js b/websocket_test/public/map.js
similarity index 100%
rename from spike/public/map.js
rename to websocket_test/public/map.js
diff --git a/spike/public/run_server.sh b/websocket_test/public/run_server.sh
similarity index 100%
rename from spike/public/run_server.sh
rename to websocket_test/public/run_server.sh
diff --git a/spike/public/test.html b/websocket_test/public/test.html
similarity index 100%
rename from spike/public/test.html
rename to websocket_test/public/test.html
diff --git a/spike/public/test/map.test.js b/websocket_test/public/test/map.test.js
similarity index 100%
rename from spike/public/test/map.test.js
rename to websocket_test/public/test/map.test.js
diff --git a/spike/public/test/suite.html b/websocket_test/public/test/suite.html
similarity index 100%
rename from spike/public/test/suite.html
rename to websocket_test/public/test/suite.html