diff --git a/TODO.txt b/TODO.txt
index 5c220a33..54add0c1 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,8 +1,5 @@
-* kick out non-beast code
-* redo directory structure
 * Change build options to C++11 only
 * Replace Jamroot with Jamfile
-* Switch source material to Boost license
 * Fix failing test/message.cpp
 * Complete allocator testing in basic_streambuf, basic_headers
 * Tidy up type_checks
@@ -11,7 +8,6 @@
   - See if we can include them now that xsl is fixed
 * Go over each header and split header material into detail and impl files
 * Make buffers_debug a detail
-* Ensure each public header has a unit test .cpp file
 * Roll header-only http parser
 * Define Parser concept in HTTP
 * melpon sandbox?
diff --git a/test/Jamfile b/test/Jamfile
index 31a36b38..329495b8 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -7,6 +7,26 @@
 
 import os ;
 
+unit-test core_tests :
+    main.cpp
+    async_completion.cpp
+    basic_streambuf.cpp
+    bind_handler.cpp
+    buffer_cat.cpp
+    buffers_adapter.cpp
+    buffers_debug.cpp
+    consuming_buffers.cpp
+    handler_alloc.cpp
+    placeholders.cpp
+    prepare_buffers.cpp
+    static_streambuf.cpp
+    streambuf.cpp
+    streambuf_readstream.cpp
+    type_check.cpp
+    detail/base64.cpp
+    detail/empty_base_optimization.cpp
+    ;
+
 unit-test http_tests :
     main.cpp
     ../src/beast_http_nodejs_parser.cpp
@@ -29,22 +49,12 @@ unit-test http_tests :
     http/write.cpp
     ;
 
-unit-test core_tests :
+unit-test websocket_tests :
     main.cpp
-    async_completion.cpp
-    basic_streambuf.cpp
-    bind_handler.cpp
-    buffer_cat.cpp
-    buffers_adapter.cpp
-    buffers_debug.cpp
-    consuming_buffers.cpp
-    handler_alloc.cpp
-    placeholders.cpp
-    prepare_buffers.cpp
-    static_streambuf.cpp
-    streambuf.cpp
-    streambuf_readstream.cpp
-    type_check.cpp
-    detail/base64.cpp
-    detail/empty_base_optimization.cpp
+    ../src/beast_http_nodejs_parser.cpp
+    websocket/error.cpp
+    websocket/option.cpp
+    websocket/rfc6455.cpp
+    websocket/static_string.cpp
+    websocket/teardown.cpp
     ;
diff --git a/test/websocket/error.cpp b/test/websocket/error.cpp
new file mode 100644
index 00000000..5800f3f2
--- /dev/null
+++ b/test/websocket/error.cpp
@@ -0,0 +1,9 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+// Test that header file is self-contained.
+#include <beast/websocket/error.hpp>
diff --git a/test/websocket/option.cpp b/test/websocket/option.cpp
new file mode 100644
index 00000000..07190cca
--- /dev/null
+++ b/test/websocket/option.cpp
@@ -0,0 +1,9 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+// Test that header file is self-contained.
+#include <beast/websocket/option.hpp>
diff --git a/test/websocket/rfc6455.cpp b/test/websocket/rfc6455.cpp
new file mode 100644
index 00000000..d7ad9068
--- /dev/null
+++ b/test/websocket/rfc6455.cpp
@@ -0,0 +1,9 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+// Test that header file is self-contained.
+#include <beast/websocket/rfc6455.hpp>
diff --git a/test/websocket/static_string.cpp b/test/websocket/static_string.cpp
new file mode 100644
index 00000000..4b6431d7
--- /dev/null
+++ b/test/websocket/static_string.cpp
@@ -0,0 +1,9 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+// Test that header file is self-contained.
+#include <beast/websocket/static_string.hpp>
diff --git a/test/websocket/teardown.cpp b/test/websocket/teardown.cpp
new file mode 100644
index 00000000..324acbe3
--- /dev/null
+++ b/test/websocket/teardown.cpp
@@ -0,0 +1,9 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+// Test that header file is self-contained.
+#include <beast/websocket/teardown.hpp>