diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 49d8d05c..880ca3f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -156,27 +156,27 @@ jobs:
           aws-region: us-west-2
 
       - name: Build the servers
-        run: cd test-server && make build-all-servers FILTER=ruby,go,cpp,php,java
+        run: cd test-server && make build-all-servers
         env:
           MAKEFLAGS: -j${{ steps.cpu-count.outputs.count }}
           AWS_REGION: us-west-2
 
       - name: Start the servers
-        run: cd test-server && make start-all-servers FILTER=ruby,go,cpp,php,java
+        run: cd test-server && make start-all-servers
         env:
           AWS_REGION: us-west-2
           TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
           TEST_SERVER_KMS_KEY_ARN: ${{ vars.TEST_SERVER_KMS_KEY_ARN }}
 
       - name: Wait for servers to start
-        run: cd test-server && make wait-all-servers FILTER=ruby,go,cpp,php,java
+        run: cd test-server && make wait-all-servers
         env:
           AWS_REGION: us-west-2
           TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
           TEST_SERVER_KMS_KEY_ARN: ${{ vars.TEST_SERVER_KMS_KEY_ARN }}
 
       - name: Run run-tests
-        run: cd test-server && make run-tests FILTER=ruby,go,cpp,php,java
+        run: cd test-server && make run-tests
         env:
           AWS_REGION: us-west-2
           TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
@@ -194,7 +194,7 @@ jobs:
             test-server/*/net-v3-server.log
 
       - name: Stop the servers
-        run: cd test-server && make stop-servers FILTER=ruby,go,cpp,php,java
+        run: cd test-server && make stop-servers
 
       - name: Upload results
         if: always()
diff --git a/test-server/net-v2-v3-server/Makefile b/test-server/net-v2-v3-server/Makefile
index b50ae4f8..9881ee38 100644
--- a/test-server/net-v2-v3-server/Makefile
+++ b/test-server/net-v2-v3-server/Makefile
@@ -11,6 +11,7 @@ build-server:
 	@echo "Building .NET V2 and V3 servers..."
 	rm -rf obj/v2 bin/v2 obj/v3 bin/v3
 	dotnet build -p:S3EncryptionVersion=v2 -o bin/v2 -p:BaseIntermediateOutputPath=obj/v2/
+	rm -rf obj
 	dotnet build -p:S3EncryptionVersion=v3 -o bin/v3 -p:BaseIntermediateOutputPath=obj/v3/
 
 start-server:
diff --git a/test-server/net-v3-transition-server/s3ec-v3-transition-branch b/test-server/net-v3-transition-server/s3ec-v3-transition-branch
index ae9327f0..ad825917 160000
--- a/test-server/net-v3-transition-server/s3ec-v3-transition-branch
+++ b/test-server/net-v3-transition-server/s3ec-v3-transition-branch
@@ -1 +1 @@
-Subproject commit ae9327f0e21999ac263bc82ae553839230ee9117
+Subproject commit ad8259173de365a13e8b3932ee02493f599f597f
diff --git a/test-server/net-v4-server/s3ec-net-v4-improved b/test-server/net-v4-server/s3ec-net-v4-improved
index 5178af52..1c0a458c 160000
--- a/test-server/net-v4-server/s3ec-net-v4-improved
+++ b/test-server/net-v4-server/s3ec-net-v4-improved
@@ -1 +1 @@
-Subproject commit 5178af527160bdb66cdbee4d04faa900bf8032f7
+Subproject commit 1c0a458c19b351c266199c72072de746362c5326