diff --git a/include/boost/wintls/detail/config.hpp b/include/boost/wintls/detail/config.hpp
index 1bfa8c5c..44c6a89d 100644
--- a/include/boost/wintls/detail/config.hpp
+++ b/include/boost/wintls/detail/config.hpp
@@ -8,8 +8,6 @@
 #ifndef BOOST_WINTLS_DETAIL_CONFIG_HPP
 #define BOOST_WINTLS_DETAIL_CONFIG_HPP
 
-//#define WINTLS_USE_STANDALONE_ASIO
-
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
diff --git a/test/utils/allocator.hpp b/test/test_stream/allocator.hpp
similarity index 100%
rename from test/utils/allocator.hpp
rename to test/test_stream/allocator.hpp
diff --git a/test/utils/config.hpp b/test/test_stream/config.hpp
similarity index 100%
rename from test/utils/config.hpp
rename to test/test_stream/config.hpp
diff --git a/test/utils/empty_value.hpp b/test/test_stream/empty_value.hpp
similarity index 100%
rename from test/utils/empty_value.hpp
rename to test/test_stream/empty_value.hpp
diff --git a/test/utils/error.hpp b/test/test_stream/error.hpp
similarity index 100%
rename from test/utils/error.hpp
rename to test/test_stream/error.hpp
diff --git a/test/utils/fail_count.hpp b/test/test_stream/fail_count.hpp
similarity index 100%
rename from test/utils/fail_count.hpp
rename to test/test_stream/fail_count.hpp
diff --git a/test/utils/flat_buffer.hpp b/test/test_stream/flat_buffer.hpp
similarity index 100%
rename from test/utils/flat_buffer.hpp
rename to test/test_stream/flat_buffer.hpp
diff --git a/test/utils/impl/error.hpp b/test/test_stream/impl/error.hpp
similarity index 100%
rename from test/utils/impl/error.hpp
rename to test/test_stream/impl/error.hpp
diff --git a/test/utils/impl/error.ipp b/test/test_stream/impl/error.ipp
similarity index 100%
rename from test/utils/impl/error.ipp
rename to test/test_stream/impl/error.ipp
diff --git a/test/utils/impl/fail_count.ipp b/test/test_stream/impl/fail_count.ipp
similarity index 100%
rename from test/utils/impl/fail_count.ipp
rename to test/test_stream/impl/fail_count.ipp
diff --git a/test/utils/impl/flat_buffer.hpp b/test/test_stream/impl/flat_buffer.hpp
similarity index 100%
rename from test/utils/impl/flat_buffer.hpp
rename to test/test_stream/impl/flat_buffer.hpp
diff --git a/test/utils/impl/is_invocable.hpp b/test/test_stream/impl/is_invocable.hpp
similarity index 100%
rename from test/utils/impl/is_invocable.hpp
rename to test/test_stream/impl/is_invocable.hpp
diff --git a/test/utils/impl/service_base.hpp b/test/test_stream/impl/service_base.hpp
similarity index 100%
rename from test/utils/impl/service_base.hpp
rename to test/test_stream/impl/service_base.hpp
diff --git a/test/utils/impl/stream.hpp b/test/test_stream/impl/stream.hpp
similarity index 100%
rename from test/utils/impl/stream.hpp
rename to test/test_stream/impl/stream.hpp
diff --git a/test/utils/impl/stream.ipp b/test/test_stream/impl/stream.ipp
similarity index 100%
rename from test/utils/impl/stream.ipp
rename to test/test_stream/impl/stream.ipp
diff --git a/test/utils/role.hpp b/test/test_stream/role.hpp
similarity index 100%
rename from test/utils/role.hpp
rename to test/test_stream/role.hpp
diff --git a/test/utils/stream.hpp b/test/test_stream/stream.hpp
similarity index 100%
rename from test/utils/stream.hpp
rename to test/test_stream/stream.hpp