diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index a97916cba6..f8e73f39fc 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -120,15 +120,11 @@ jobs:
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.inference
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.linear
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.navigation
-          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.navigation2
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.sam
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.sfm
-          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.sfm2
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.symbolic
-          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.symbolic2
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.hybrid
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.nonlinear
-          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.nonlinear2
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.slam
 
           # Run GTSAM_UNSTABLE tests
@@ -140,3 +136,7 @@ jobs:
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.nonlinear_unstable
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.slam_unstable
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.partition
+
+      - name: Test
+        run: |
+           cmake --build build -j4 --config ${{ matrix.build_type }} --target check
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebe27443ae..f70089aca8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,14 @@ set (CMAKE_PROJECT_VERSION_MAJOR ${GTSAM_VERSION_MAJOR})
 set (CMAKE_PROJECT_VERSION_MINOR ${GTSAM_VERSION_MINOR})
 set (CMAKE_PROJECT_VERSION_PATCH ${GTSAM_VERSION_PATCH})
 
+if(MSVC)
+  set(MSVC_LINKER_FLAGS "/FORCE:MULTIPLE")
+  set(CMAKE_EXE_LINKER_FLAGS ${MSVC_LINKER_FLAGS})
+  set(CMAKE_MODULE_LINKER_FLAGS ${MSVC_LINKER_FLAGS})
+  set(CMAKE_SHARED_LINKER_FLAGS ${MSVC_LINKER_FLAGS})
+  set(CMAKE_STATIC_LINKER_FLAGS ${MSVC_LINKER_FLAGS})
+endif()
+
 ###############################################################################
 # Gather information, perform checks, set defaults
 
diff --git a/gtsam/navigation/tests/CMakeLists.txt b/gtsam/navigation/tests/CMakeLists.txt
index 720fc92c59..a7212da34c 100644
--- a/gtsam/navigation/tests/CMakeLists.txt
+++ b/gtsam/navigation/tests/CMakeLists.txt
@@ -29,7 +29,4 @@ if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
   list(APPEND tests_excluded testSerializationNavigation.cpp)
 endif()
 
-list(APPEND tests_excluded testImuFactor.cpp testMagPoseFactor.cpp)
-
 gtsamAddTestsGlob(navigation "test*.cpp" "${tests_excluded}" "${test_link_libraries}")
-gtsamAddTestsGlob(navigation2 "testImuFactor.cpp testMagPoseFactor.cpp" "" "${test_link_libraries}")
diff --git a/gtsam/nonlinear/tests/CMakeLists.txt b/gtsam/nonlinear/tests/CMakeLists.txt
index 06fa6ba6ef..4dcd5f4e9c 100644
--- a/gtsam/nonlinear/tests/CMakeLists.txt
+++ b/gtsam/nonlinear/tests/CMakeLists.txt
@@ -6,7 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-list(APPEND EXCLUDE_TESTS testExpression.cpp)
-
 gtsamAddTestsGlob(nonlinear "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
-gtsamAddTestsGlob(nonlinear2 "testExpression.cpp" "" "gtsam")
diff --git a/gtsam/sfm/tests/CMakeLists.txt b/gtsam/sfm/tests/CMakeLists.txt
index b3e63bcca4..22245dffec 100644
--- a/gtsam/sfm/tests/CMakeLists.txt
+++ b/gtsam/sfm/tests/CMakeLists.txt
@@ -1,4 +1 @@
-set(tests_excluded testMFAS.cpp testBinaryMeasurement.cpp)
-
-gtsamAddTestsGlob(sfm "test*.cpp" "${tests_excluded}" "gtsam")
-gtsamAddTestsGlob(sfm2 "testBinaryMeasurement.cpp testMFAS.cpp" "" "gtsam")
+gtsamAddTestsGlob(sfm "test*.cpp" "" "gtsam")
diff --git a/gtsam/symbolic/tests/CMakeLists.txt b/gtsam/symbolic/tests/CMakeLists.txt
index bc6de8ed47..65a7cf719c 100644
--- a/gtsam/symbolic/tests/CMakeLists.txt
+++ b/gtsam/symbolic/tests/CMakeLists.txt
@@ -6,7 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-list(APPEND EXCLUDE_TESTS testSymbolicConditional.cpp)
-
 gtsamAddTestsGlob(symbolic "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
-gtsamAddTestsGlob(symbolic2 "testSymbolicConditional.cpp" "" "gtsam")