diff --git a/.devcontainer b/.devcontainer
index e3220ab..a16d3d9 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit e3220ab439d4475eb9bb6b9a9c84919ba63d095e
+Subproject commit a16d3d9b36c91d09d247bb6d1392b5ec007031d6
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9a4d4ff..1299de6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,8 +3,8 @@ get_cmake_property(pros VARIABLES)
 # xp_ variables from pros.cmake, included by xproinc.cmake
 list(FILTER pros INCLUDE REGEX "^xp_")
 list(SORT pros)
-list(REMOVE_ITEM pros xp_googletest xp_Threads)
-list(PREPEND pros xp_Threads xp_googletest) # make Threads and googletest first
+list(REMOVE_ITEM pros xp_googletest)
+list(PREPEND pros xp_googletest) # make googletest first
 find_program(XVFB_RUN_EXEC xvfb-run)
 if(XVFB_RUN_EXEC)
   set(xvfb_cmd ${XVFB_RUN_EXEC})
@@ -79,7 +79,7 @@ foreach(pro ${pros})
       target_compile_definitions(${pro}_test PRIVATE ${${pro}_compile_definitions})
       list(APPEND all_compile_definitions ${${pro}_compile_definitions})
     endif()
-    if(pro STREQUAL "wxx" AND MSVC_VERSION VERSION_EQUAL 1950)
+    if(pro STREQUAL "wxx" AND MSVC_VERSION VERSION_GREATER_EQUAL 1950)
       message(STATUS "Skipping wxx_test on VS2026 (MSVC_VERSION 1950) due to known hang issue")
     elseif(pro STREQUAL "wxx" AND XVFB_RUN_EXEC)
       add_test(NAME ${pro}_test COMMAND ${XVFB_RUN_EXEC} -a