diff --git a/docs/TODO b/docs/TODO
index 1166e5e..2736bea 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1 +1,7 @@
 - wstelnet: support CSI L and CSI M
+
+- mod_websockify module for Apache
+
+- create gevent version:
+    http://nichol.as/benchmark-of-python-web-servers
+    http://n01se.net/paste/QXO
diff --git a/tests/wsecho.html b/tests/echo.html
similarity index 100%
rename from tests/wsecho.html
rename to tests/echo.html
diff --git a/tests/wsecho.py b/tests/echo.py
similarity index 100%
rename from tests/wsecho.py
rename to tests/echo.py
diff --git a/tests/wsencoding.html b/tests/encoding.html
similarity index 100%
rename from tests/wsencoding.html
rename to tests/encoding.html
diff --git a/tests/wsencoding.py b/tests/encoding.py
similarity index 100%
rename from tests/wsencoding.py
rename to tests/encoding.py
diff --git a/tests/wstest.html b/tests/load.html
similarity index 100%
rename from tests/wstest.html
rename to tests/load.html
diff --git a/tests/wstest.py b/tests/load.py
similarity index 100%
rename from tests/wstest.py
rename to tests/load.py
diff --git a/websocket.py b/websocket.py
index e8db441..1ed21d2 100755
--- a/websocket.py
+++ b/websocket.py
@@ -260,7 +260,6 @@ Connection: Upgrade\r
 
         # Now get the data from the socket
         handshake = retsock.recv(4096)
-        #self.msg("handshake: " + repr(handshake))
 
         if len(handshake) == 0:
             raise self.EClose("Client closed during handshake")
@@ -278,6 +277,7 @@ Connection: Upgrade\r
             else:
                 raise self.EClose("")
 
+        #self.msg("handshake: " + repr(handshake))
         # Parse client WebSockets handshake
         h = self.parse_handshake(handshake)