diff --git a/src/perf/lib/PerfClient.cpp b/src/perf/lib/PerfClient.cpp
index 1b6542be87..30dae7a391 100644
--- a/src/perf/lib/PerfClient.cpp
+++ b/src/perf/lib/PerfClient.cpp
@@ -442,7 +442,7 @@ PerfClient::Wait(
     }
 
     if (GetConnectedConnections() == 0) {
-        WriteOutput("Error: No Successful Connections!\n");
+        WriteOutput("Error: Nooooooooooooooooo!\n");
         return QUIC_STATUS_CONNECTION_REFUSED;
     }
 
diff --git a/src/test/bin/quic_gtest.cpp b/src/test/bin/quic_gtest.cpp
index ea2bf17274..92fadcfe72 100644
--- a/src/test/bin/quic_gtest.cpp
+++ b/src/test/bin/quic_gtest.cpp
@@ -1559,14 +1559,14 @@ TEST_P(WithFamilyArgs, ClientBlockedSourcePort) {
 
 #if QUIC_TEST_DATAPATH_HOOKS_ENABLED
 TEST_P(WithFamilyArgs, RebindPort) {
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-//     if (UseQTIP) {
-//         //
-//         // NAT rebind doesn't make sense for TCP and QTIP.
-//         //
-//         return;
-//     }
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+    if (UseQTIP) {
+        //
+        // NAT rebind doesn't make sense for TCP and QTIP.
+        //
+        return;
+    }
+#endif
     TestLoggerT<ParamType> Logger("QuicTestNatPortRebind", GetParam());
     if (TestingKernelMode) {
         QUIC_RUN_REBIND_PARAMS Params = {
@@ -1580,14 +1580,14 @@ TEST_P(WithFamilyArgs, RebindPort) {
 }
 
 TEST_P(WithRebindPaddingArgs, RebindPortPadded) {
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-//     if (UseQTIP) {
-//         //
-//         // NAT rebind doesn't make sense for TCP and QTIP.
-//         //
-//         return;
-//     }
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+    if (UseQTIP) {
+        //
+        // NAT rebind doesn't make sense for TCP and QTIP.
+        //
+        return;
+    }
+#endif
     TestLoggerT<ParamType> Logger("QuicTestNatPortRebind(pad)", GetParam());
     if (TestingKernelMode) {
         QUIC_RUN_REBIND_PARAMS Params = {
@@ -1601,14 +1601,14 @@ TEST_P(WithRebindPaddingArgs, RebindPortPadded) {
 }
 
 TEST_P(WithFamilyArgs, RebindAddr) {
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-//     if (UseQTIP) {
-//         //
-//         // NAT rebind doesn't make sense for TCP and QTIP.
-//         //
-//         return;
-//     }
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+    if (UseQTIP) {
+        //
+        // NAT rebind doesn't make sense for TCP and QTIP.
+        //
+        return;
+    }
+#endif
     TestLoggerT<ParamType> Logger("QuicTestNatAddrRebind", GetParam());
     if (TestingKernelMode) {
         QUIC_RUN_REBIND_PARAMS Params = {
@@ -1623,7 +1623,7 @@ TEST_P(WithFamilyArgs, RebindAddr) {
 
 TEST_P(WithFamilyArgs, RebindDatapathAddr) {
 #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-    if (!UseDuoNic) { // OLD: (UseQTIP || !UseDuoNic)
+    if (UseQTIP || !UseDuoNic) {
         //
         // NAT rebind doesn't make sense for TCP and QTIP.
         //
@@ -1637,14 +1637,14 @@ TEST_P(WithFamilyArgs, RebindDatapathAddr) {
 }
 
 TEST_P(WithRebindPaddingArgs, RebindAddrPadded) {
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-    // if (UseQTIP) {
-    //     //
-    //     // NAT rebind doesn't make sense for TCP and QTIP.
-    //     //
-    //     return;
-    // }
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+    if (UseQTIP) {
+        //
+        // NAT rebind doesn't make sense for TCP and QTIP.
+        //
+        return;
+    }
+#endif
     TestLoggerT<ParamType> Logger("QuicTestNatAddrRebind(pad)", GetParam());
     if (TestingKernelMode) {
         QUIC_RUN_REBIND_PARAMS Params = {
@@ -1833,13 +1833,13 @@ TEST_P(WithSendArgs3, SendIntermittently) {
 
 TEST_P(WithSend0RttArgs1, Send0Rtt) {
 #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-    // if (UseQTIP) {
-    //     //
-    //     // QTIP doesn't work with 0-RTT. QTIP only pauses and caches 1 packet during
-    //     // TCP handshake.
-    //     //
-    //     return;
-    // }
+    if (UseQTIP) {
+        //
+        // QTIP doesn't work with 0-RTT. QTIP only pauses and caches 1 packet during
+        // TCP handshake.
+        //
+        return;
+    }
 #endif
 
     TestLoggerT<ParamType> Logger("Send0Rtt", GetParam());
diff --git a/src/test/bin/quic_gtest.h b/src/test/bin/quic_gtest.h
index e9e4da04c8..c280313c23 100644
--- a/src/test/bin/quic_gtest.h
+++ b/src/test/bin/quic_gtest.h
@@ -415,11 +415,11 @@ struct SendArgs2 {
         for (bool UseZeroRtt : { false })
 #endif
         {
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-//             if (UseQTIP && UseZeroRtt) {
-//                 continue;
-//             }
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+            if (UseQTIP && UseZeroRtt) {
+                continue;
+            }
+#endif
             list.push_back({ Family, UseSendBuffer, UseZeroRtt });
         }
         return list;
diff --git a/src/test/lib/ApiTest.cpp b/src/test/lib/ApiTest.cpp
index c7b2598034..71bda9c8ef 100644
--- a/src/test/lib/ApiTest.cpp
+++ b/src/test/lib/ApiTest.cpp
@@ -2607,9 +2607,9 @@ void QuicTestGlobalParam()
             SimpleGetParamTest(nullptr, QUIC_PARAM_GLOBAL_EXECUTION_CONFIG, DataLength, Data);
         }
 
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-//         if (!UseQTIP && !UseDuoNic)
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+        if (!UseQTIP && !UseDuoNic)
+#endif
         {
             //
             // Good GetParam with length == 0
diff --git a/src/test/lib/DataTest.cpp b/src/test/lib/DataTest.cpp
index 5bd2e1af73..87f05ff115 100644
--- a/src/test/lib/DataTest.cpp
+++ b/src/test/lib/DataTest.cpp
@@ -507,9 +507,9 @@ QuicTestConnectAndPing(
                     TEST_QUIC_SUCCEEDED(Connections.get()[i]->SetRemoteAddr(RemoteAddr));
 
                     if (i != 0
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-//                         && !UseQTIP
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+                        && !UseQTIP
+#endif
                     ) {
                         Connections.get()[i]->SetLocalAddr(LocalAddr);
                     }
@@ -522,9 +522,9 @@ QuicTestConnectAndPing(
                             ServerLocalAddr.GetPort()));
 
                     if (i == 0
-// #if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
-//                         && !UseQTIP
-// #endif
+#if defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
+                        && !UseQTIP
+#endif
                     ) {
                         Connections.get()[i]->GetLocalAddr(LocalAddr);
                     }