diff --git a/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut.c b/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut.c
index c641aee..78d45a5 100644
--- a/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut.c
+++ b/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut.c
@@ -45,7 +45,7 @@ static HRESULT MU_C2(real_, CREATE_IFABRICINSTANCE_NAME(IFabricZZZZ))(IFabricZZZ
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -67,7 +67,7 @@ TEST_SUITE_INITIALIZE(suite_init)
 
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut_pch.h b/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut_pch.h
index 330e4b1..fea56d8 100644
--- a/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut_pch.h
+++ b/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut_pch.h
@@ -27,6 +27,8 @@
 
 /*for the purpose of these tests, there's going to be a phony IFabricZZZ interface*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
@@ -41,4 +43,4 @@
 
 #include "hfabriczzzz.h"
 
-#endif // H_FABRIC_MACRO_GENERATOR_UT_PCH_H
+#endif // H_FABRIC_MACRO_GENERATOR_UT_PCH_H
\ No newline at end of file
diff --git a/tests/common_argc_argv_int/CMakeLists.txt b/tests/common_argc_argv_int/CMakeLists.txt
index ce67a9e..f5c4488 100644
--- a/tests/common_argc_argv_int/CMakeLists.txt
+++ b/tests/common_argc_argv_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/common_argc_argv_int/common_argc_argv_int.c b/tests/common_argc_argv_int/common_argc_argv_int.c
index 31bf27e..79fe9ee 100644
--- a/tests/common_argc_argv_int/common_argc_argv_int.c
+++ b/tests/common_argc_argv_int/common_argc_argv_int.c
@@ -13,16 +13,17 @@
 #include "c_pal/gballoc_hl_redirect.h"
 
 #include "c_pal/string_utils.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/common_argc_argv.h"
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -310,4 +311,4 @@ TEST_FUNCTION(ARGC_ARGV_concat_from_2_plus_2_yields_4)
 }
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/configuration_package_change_handler_ut/CMakeLists.txt b/tests/configuration_package_change_handler_ut/CMakeLists.txt
index 44bb31f..056f70c 100644
--- a/tests/configuration_package_change_handler_ut/CMakeLists.txt
+++ b/tests/configuration_package_change_handler_ut/CMakeLists.txt
@@ -21,5 +21,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS sf_c_util c_util com_wrapper debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal sf_c_util c_util com_wrapper debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/configuration_package_change_handler_ut_pch.h")
diff --git a/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut.c b/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut.c
index 2816287..2404326 100644
--- a/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut.c
+++ b/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut.c
@@ -71,7 +71,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -82,7 +82,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GBALLOC_HL_GLOBAL_MOCK_HOOK();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut_pch.h b/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut_pch.h
index 51fa925..9d54c98 100644
--- a/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut_pch.h
+++ b/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut_pch.h
@@ -22,6 +22,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -37,4 +39,4 @@
 #include "sf_c_util/fabric_configuration_package_change_handler_com.h"
 #include "sf_c_util/configuration_package_change_handler.h"
 
-#endif // CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
+#endif // CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
\ No newline at end of file
diff --git a/tests/configuration_reader_ut/CMakeLists.txt b/tests/configuration_reader_ut/CMakeLists.txt
index 46ad69c..81251fc 100644
--- a/tests/configuration_reader_ut/CMakeLists.txt
+++ b/tests/configuration_reader_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName configuration_reader_ut)
@@ -19,5 +19,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS debug FabricUUIDD optimized FabricUUID c_pal_reals c_util_reals c_util_test_helpers
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal debug FabricUUIDD optimized FabricUUID c_pal_reals c_util_reals c_util_test_helpers
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/configuration_reader_ut_pch.h")
diff --git a/tests/configuration_reader_ut/configuration_reader_ut.c b/tests/configuration_reader_ut/configuration_reader_ut.c
index 69377cb..7c6b23b 100644
--- a/tests/configuration_reader_ut/configuration_reader_ut.c
+++ b/tests/configuration_reader_ut/configuration_reader_ut.c
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "configuration_reader_ut_pch.h"
@@ -114,7 +114,7 @@ static void setup_expectation_read_double_values(void)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -139,7 +139,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_TYPE(LPCWSTR, const_wcharptr);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/configuration_reader_ut/configuration_reader_ut_pch.h b/tests/configuration_reader_ut/configuration_reader_ut_pch.h
index 69aff71..7e60208 100644
--- a/tests/configuration_reader_ut/configuration_reader_ut_pch.h
+++ b/tests/configuration_reader_ut/configuration_reader_ut_pch.h
@@ -31,6 +31,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
@@ -55,4 +57,4 @@
 
 #include "sf_c_util/configuration_reader.h"
 
-#endif // CONFIGURATION_READER_UT_PCH_H
+#endif // CONFIGURATION_READER_UT_PCH_H
\ No newline at end of file
diff --git a/tests/fabric_async_op_cb_ut/CMakeLists.txt b/tests/fabric_async_op_cb_ut/CMakeLists.txt
index cb4989b..73e36ff 100644
--- a/tests/fabric_async_op_cb_ut/CMakeLists.txt
+++ b/tests/fabric_async_op_cb_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_async_op_cb_ut)
@@ -17,5 +17,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_async_op_cb_ut_pch.h")
diff --git a/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut.c b/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut.c
index 7709511..f03b41c 100644
--- a/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut.c
+++ b/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut.c
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "fabric_async_op_cb_ut_pch.h"
@@ -19,7 +19,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -28,7 +28,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GBALLOC_HL_GLOBAL_MOCK_HOOK();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut_pch.h b/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut_pch.h
index 8a5a1cf..f9c75e7 100644
--- a/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut_pch.h
+++ b/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut_pch.h
@@ -17,6 +17,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -28,4 +30,4 @@
 
 #include "sf_c_util/fabric_async_op_cb.h"
 
-#endif // FABRIC_ASYNC_OP_CB_UT_PCH_H
+#endif // FABRIC_ASYNC_OP_CB_UT_PCH_H
\ No newline at end of file
diff --git a/tests/fabric_async_op_sync_wrapper_ut/CMakeLists.txt b/tests/fabric_async_op_sync_wrapper_ut/CMakeLists.txt
index d448941..b5db6db 100644
--- a/tests/fabric_async_op_sync_wrapper_ut/CMakeLists.txt
+++ b/tests/fabric_async_op_sync_wrapper_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_async_op_sync_wrapper_ut)
@@ -32,4 +32,4 @@ testasyncoperation.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper synchronization c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID com_wrapper synchronization c_pal_reals sf_c_util)
diff --git a/tests/fabric_async_op_sync_wrapper_ut/fabric_async_op_sync_wrapper_ut.c b/tests/fabric_async_op_sync_wrapper_ut/fabric_async_op_sync_wrapper_ut.c
index 78e601a..d59ee8f 100644
--- a/tests/fabric_async_op_sync_wrapper_ut/fabric_async_op_sync_wrapper_ut.c
+++ b/tests/fabric_async_op_sync_wrapper_ut/fabric_async_op_sync_wrapper_ut.c
@@ -90,7 +90,7 @@ static HRESULT my_TEST_FABRIC_ASYNC_OPERATION_HANDLE_ITestAsyncOperation_test_fa
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -113,7 +113,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_UMOCK_ALIAS_TYPE(TEST_ASYNC_OPERATION_CONTEXT_HANDLE_DESTROY_FUNC, void*);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/fabric_async_op_wrapper_ut/CMakeLists.txt b/tests/fabric_async_op_wrapper_ut/CMakeLists.txt
index df4d7c2..de9dbdf 100644
--- a/tests/fabric_async_op_wrapper_ut/CMakeLists.txt
+++ b/tests/fabric_async_op_wrapper_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_async_op_wrapper_ut)
@@ -32,4 +32,4 @@ testasyncoperation.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals sf_c_util)
diff --git a/tests/fabric_async_op_wrapper_ut/fabric_async_op_wrapper_ut.c b/tests/fabric_async_op_wrapper_ut/fabric_async_op_wrapper_ut.c
index 5231d51..39e66a5 100644
--- a/tests/fabric_async_op_wrapper_ut/fabric_async_op_wrapper_ut.c
+++ b/tests/fabric_async_op_wrapper_ut/fabric_async_op_wrapper_ut.c
@@ -109,7 +109,7 @@ static void setup_success_async_execute_completed_synchronously(USER_INVOKE_CB*
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -133,7 +133,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_UMOCK_ALIAS_TYPE(TEST_ASYNC_OPERATION_CONTEXT_HANDLE_DESTROY_FUNC, void*);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/fabric_configuration_package_change_handler_ut/CMakeLists.txt b/tests/fabric_configuration_package_change_handler_ut/CMakeLists.txt
index 98dd7f5..560b0b8 100644
--- a/tests/fabric_configuration_package_change_handler_ut/CMakeLists.txt
+++ b/tests/fabric_configuration_package_change_handler_ut/CMakeLists.txt
@@ -17,5 +17,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_configuration_package_change_handler_ut_pch.h")
diff --git a/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut.c b/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut.c
index a91e099..9550d22 100644
--- a/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut.c
+++ b/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut.c
@@ -32,7 +32,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -41,7 +41,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GBALLOC_HL_GLOBAL_MOCK_HOOK();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut_pch.h b/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut_pch.h
index 9d1b2b1..e22ce7a 100644
--- a/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut_pch.h
+++ b/tests/fabric_configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut_pch.h
@@ -17,6 +17,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -28,4 +30,4 @@
 
 #include "sf_c_util/fabric_configuration_package_change_handler.h"
 
-#endif // FABRIC_CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
+#endif // FABRIC_CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
\ No newline at end of file
diff --git a/tests/fabric_op_completed_sync_ctx_ut/CMakeLists.txt b/tests/fabric_op_completed_sync_ctx_ut/CMakeLists.txt
index 23331d5..8070fd7 100644
--- a/tests/fabric_op_completed_sync_ctx_ut/CMakeLists.txt
+++ b/tests/fabric_op_completed_sync_ctx_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_op_completed_sync_ctx_ut)
@@ -20,5 +20,5 @@ test_callback_com.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_op_completed_sync_ctx_ut_pch.h")
diff --git a/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut.c b/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut.c
index 184386b..ab1fb68 100644
--- a/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut.c
+++ b/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut.c
@@ -19,7 +19,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -36,7 +36,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_UMOCK_ALIAS_TYPE(TEST_CALLBACK_HANDLE_DESTROY_FUNC, void*);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut_pch.h b/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut_pch.h
index 70dba86..6660e14 100644
--- a/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut_pch.h
+++ b/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut_pch.h
@@ -23,6 +23,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -40,4 +42,4 @@
 
 #include "sf_c_util/fabric_op_completed_sync_ctx.h"
 
-#endif // FABRIC_OP_COMPLETED_SYNC_CTX_UT_PCH_H
+#endif // FABRIC_OP_COMPLETED_SYNC_CTX_UT_PCH_H
\ No newline at end of file
diff --git a/tests/fabric_string_result_ut/CMakeLists.txt b/tests/fabric_string_result_ut/CMakeLists.txt
index 4bf48b5..0c735ab 100644
--- a/tests/fabric_string_result_ut/CMakeLists.txt
+++ b/tests/fabric_string_result_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_string_result_ut)
@@ -17,5 +17,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_string_result_ut_pch.h")
diff --git a/tests/fabric_string_result_ut/fabric_string_result_ut.c b/tests/fabric_string_result_ut/fabric_string_result_ut.c
index 2be3cc6..ae53b14 100644
--- a/tests/fabric_string_result_ut/fabric_string_result_ut.c
+++ b/tests/fabric_string_result_ut/fabric_string_result_ut.c
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "fabric_string_result_ut_pch.h"
@@ -13,7 +13,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -23,7 +23,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GLOBAL_MOCK_FAIL_RETURN(malloc, NULL);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/fabric_string_result_ut/fabric_string_result_ut_pch.h b/tests/fabric_string_result_ut/fabric_string_result_ut_pch.h
index fbedd7f..6baa499 100644
--- a/tests/fabric_string_result_ut/fabric_string_result_ut_pch.h
+++ b/tests/fabric_string_result_ut/fabric_string_result_ut_pch.h
@@ -19,6 +19,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -30,4 +32,4 @@
 
 #include "sf_c_util/fabric_string_result.h"
 
-#endif // FABRIC_STRING_RESULT_UT_PCH_H
+#endif // FABRIC_STRING_RESULT_UT_PCH_H
\ No newline at end of file
diff --git a/tests/fc_activation_context_and_sf_config_int/CMakeLists.txt b/tests/fc_activation_context_and_sf_config_int/CMakeLists.txt
index 0858923..b772903 100644
--- a/tests/fc_activation_context_and_sf_config_int/CMakeLists.txt
+++ b/tests/fc_activation_context_and_sf_config_int/CMakeLists.txt
@@ -17,4 +17,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_activation_context_and_sf_config_int/fc_activation_context_and_sf_config_int.c b/tests/fc_activation_context_and_sf_config_int/fc_activation_context_and_sf_config_int.c
index dc544b9..11213f6 100644
--- a/tests/fc_activation_context_and_sf_config_int/fc_activation_context_and_sf_config_int.c
+++ b/tests/fc_activation_context_and_sf_config_int/fc_activation_context_and_sf_config_int.c
@@ -12,6 +12,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "com_wrapper/com_wrapper.h"
 
@@ -26,11 +27,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -219,4 +220,4 @@ TEST_FUNCTION(sf_config_can_parse_no_optional_configs_present)
 }
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_activation_context_int/CMakeLists.txt b/tests/fc_activation_context_int/CMakeLists.txt
index 8775545..17232fd 100644
--- a/tests/fc_activation_context_int/CMakeLists.txt
+++ b/tests/fc_activation_context_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_activation_context_int/fc_activation_context_int.c b/tests/fc_activation_context_int/fc_activation_context_int.c
index 4d692df..db9f28f 100644
--- a/tests/fc_activation_context_int/fc_activation_context_int.c
+++ b/tests/fc_activation_context_int/fc_activation_context_int.c
@@ -12,6 +12,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "com_wrapper/com_wrapper.h"
 
@@ -24,11 +25,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -1027,4 +1028,4 @@ TEST_FUNCTION(IFabricCodePackageActivationContext_to_ARGC_ARGV_succeeds_3) /*has
 }
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_erd_argc_argv_int/CMakeLists.txt b/tests/fc_erd_argc_argv_int/CMakeLists.txt
index ba38f39..0f93e30 100644
--- a/tests/fc_erd_argc_argv_int/CMakeLists.txt
+++ b/tests/fc_erd_argc_argv_int/CMakeLists.txt
@@ -17,4 +17,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_erd_argc_argv_int/fc_erd_argc_argv_int.c b/tests/fc_erd_argc_argv_int/fc_erd_argc_argv_int.c
index 5ae7c87..83628b9 100644
--- a/tests/fc_erd_argc_argv_int/fc_erd_argc_argv_int.c
+++ b/tests/fc_erd_argc_argv_int/fc_erd_argc_argv_int.c
@@ -11,6 +11,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/common_argc_argv.h"
 
@@ -20,11 +21,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -350,4 +351,4 @@ TEST_FUNCTION(FABRIC_ENDPOINT_RESOURCE_DESCRIPTION_free_suucceeds)
 }
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_erdl_argc_argv_int/CMakeLists.txt b/tests/fc_erdl_argc_argv_int/CMakeLists.txt
index b6e8078..60b836a 100644
--- a/tests/fc_erdl_argc_argv_int/CMakeLists.txt
+++ b/tests/fc_erdl_argc_argv_int/CMakeLists.txt
@@ -17,4 +17,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_erdl_argc_argv_int/fc_erdl_argc_argv_int.c b/tests/fc_erdl_argc_argv_int/fc_erdl_argc_argv_int.c
index 291308f..94361c6 100644
--- a/tests/fc_erdl_argc_argv_int/fc_erdl_argc_argv_int.c
+++ b/tests/fc_erdl_argc_argv_int/fc_erdl_argc_argv_int.c
@@ -11,6 +11,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/common_argc_argv.h"
 
@@ -20,11 +21,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -326,4 +327,4 @@ TEST_FUNCTION(FABRIC_ENDPOINT_RESOURCE_DESCRIPTION_LIST_from_ARGC_ARGV_succeeds_
 
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_package_argc_argv_int/CMakeLists.txt b/tests/fc_package_argc_argv_int/CMakeLists.txt
index 44bb75d..084659a 100644
--- a/tests/fc_package_argc_argv_int/CMakeLists.txt
+++ b/tests/fc_package_argc_argv_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_package_argc_argv_int/fc_package_argc_argv_int.c b/tests/fc_package_argc_argv_int/fc_package_argc_argv_int.c
index 0e75a48..8ade1f3 100644
--- a/tests/fc_package_argc_argv_int/fc_package_argc_argv_int.c
+++ b/tests/fc_package_argc_argv_int/fc_package_argc_argv_int.c
@@ -12,6 +12,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "com_wrapper/com_wrapper.h"
 
@@ -46,11 +47,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -1756,4 +1757,4 @@ TEST_FUNCTION(FC_PACKAGE_with_2_sections_each_with_2_parameters_to_argc_argv_suc
     obj->lpVtbl->Release(obj);
 }
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_parameter_argc_argv_int/CMakeLists.txt b/tests/fc_parameter_argc_argv_int/CMakeLists.txt
index 0425dce..572f451 100644
--- a/tests/fc_parameter_argc_argv_int/CMakeLists.txt
+++ b/tests/fc_parameter_argc_argv_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_parameter_argc_argv_int/fc_parameter_argc_argv_int.c b/tests/fc_parameter_argc_argv_int/fc_parameter_argc_argv_int.c
index 502b67f..ecfd771 100644
--- a/tests/fc_parameter_argc_argv_int/fc_parameter_argc_argv_int.c
+++ b/tests/fc_parameter_argc_argv_int/fc_parameter_argc_argv_int.c
@@ -11,6 +11,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/common_argc_argv.h"
 
@@ -20,11 +21,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -154,4 +155,4 @@ TEST_FUNCTION(FABRIC_CONFIGURATION_PARAMETER_from_ARGC_ARGV_cannot_be_keywords)
     }
 }
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_parameter_list_argc_argv_int/CMakeLists.txt b/tests/fc_parameter_list_argc_argv_int/CMakeLists.txt
index 63a8d0d..0dc51db 100644
--- a/tests/fc_parameter_list_argc_argv_int/CMakeLists.txt
+++ b/tests/fc_parameter_list_argc_argv_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_parameter_list_argc_argv_int/fc_parameter_list_argc_argv_int.c b/tests/fc_parameter_list_argc_argv_int/fc_parameter_list_argc_argv_int.c
index 45b7d5f..b74880f 100644
--- a/tests/fc_parameter_list_argc_argv_int/fc_parameter_list_argc_argv_int.c
+++ b/tests/fc_parameter_list_argc_argv_int/fc_parameter_list_argc_argv_int.c
@@ -11,6 +11,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/common_argc_argv.h"
 
@@ -20,11 +21,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -446,4 +447,4 @@ TEST_FUNCTION(FABRIC_CONFIGURATION_PARAMETER_LIST_from_ARGC_ARGV_with_2_paramete
 
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_section_argc_argv_int/CMakeLists.txt b/tests/fc_section_argc_argv_int/CMakeLists.txt
index 6af3db3..ea01811 100644
--- a/tests/fc_section_argc_argv_int/CMakeLists.txt
+++ b/tests/fc_section_argc_argv_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_section_argc_argv_int/fc_section_argc_argv_int.c b/tests/fc_section_argc_argv_int/fc_section_argc_argv_int.c
index 65061dc..cb73555 100644
--- a/tests/fc_section_argc_argv_int/fc_section_argc_argv_int.c
+++ b/tests/fc_section_argc_argv_int/fc_section_argc_argv_int.c
@@ -11,6 +11,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/fc_section_argc_argv.h"
 
@@ -18,11 +19,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -537,4 +538,4 @@ TEST_FUNCTION(FABRIC_CONFIGURATION_SECTION_from_ARGC_ARGV_2_parameters_followed_
 
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/fc_section_list_argc_argv_int/CMakeLists.txt b/tests/fc_section_list_argc_argv_int/CMakeLists.txt
index 3a93239..50a23e7 100644
--- a/tests/fc_section_list_argc_argv_int/CMakeLists.txt
+++ b/tests/fc_section_list_argc_argv_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/fc_section_list_argc_argv_int/fc_section_list_argc_argv_int.c b/tests/fc_section_list_argc_argv_int/fc_section_list_argc_argv_int.c
index ba4e3ec..ee63ff6 100644
--- a/tests/fc_section_list_argc_argv_int/fc_section_list_argc_argv_int.c
+++ b/tests/fc_section_list_argc_argv_int/fc_section_list_argc_argv_int.c
@@ -11,6 +11,7 @@
 
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/fc_section_list_argc_argv.h"
 
@@ -18,11 +19,11 @@ TEST_DEFINE_ENUM_TYPE(ARGC_ARGV_DATA_RESULT, ARGC_ARGV_DATA_RESULT_VALUES);
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -2208,4 +2209,4 @@ TEST_FUNCTION(FABRIC_CONFIGURATION_SECTION_LIST_from_ARGC_ARGV_with_sectionName_
 }
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/hresult_to_string_int/CMakeLists.txt b/tests/hresult_to_string_int/CMakeLists.txt
index 8bff79a..28911b6 100644
--- a/tests/hresult_to_string_int/CMakeLists.txt
+++ b/tests/hresult_to_string_int/CMakeLists.txt
@@ -7,4 +7,4 @@ set(${theseTestsName}_test_files
 ${theseTestsName}.c
 )
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal sf_c_util)
diff --git a/tests/hresult_to_string_int/hresult_to_string_int.c b/tests/hresult_to_string_int/hresult_to_string_int.c
index 52cbd2c..c903970 100644
--- a/tests/hresult_to_string_int/hresult_to_string_int.c
+++ b/tests/hresult_to_string_int/hresult_to_string_int.c
@@ -9,6 +9,7 @@
 
 #include "macro_utils/macro_utils.h"
 #include "testrunnerswitcher.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/hresult_to_string.h"
 
@@ -26,12 +27,12 @@ static const HRESULT TEST_HRESULT_E_POINTER = TEST_HRESULT_E_POINTER_DEFINE;
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, gballoc_hl_init(NULL, NULL));
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     gballoc_hl_deinit();
 }
@@ -126,4 +127,4 @@ TEST_FUNCTION(hresult_to_string_succeeds)
     free(t);
 }
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
\ No newline at end of file
diff --git a/tests/hresult_to_string_ut/CMakeLists.txt b/tests/hresult_to_string_ut/CMakeLists.txt
index 005e9a9..924a541 100644
--- a/tests/hresult_to_string_ut/CMakeLists.txt
+++ b/tests/hresult_to_string_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName hresult_to_string_ut)
@@ -16,7 +16,7 @@ set(${theseTestsName}_h_files
 ../../inc/sf_c_util/hresult_to_string.h
 )
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/hresult_to_string_ut_pch.h")
 
 if("${building}" STREQUAL "exe")
diff --git a/tests/hresult_to_string_ut/hresult_to_string_ut.c b/tests/hresult_to_string_ut/hresult_to_string_ut.c
index 4b7a7a4..6317ad3 100644
--- a/tests/hresult_to_string_ut/hresult_to_string_ut.c
+++ b/tests/hresult_to_string_ut/hresult_to_string_ut.c
@@ -72,7 +72,7 @@ static const wchar_t* TEST_HRESULT_WINHTTP_WSTRING = TEST_HRESULT_WINHTTP_WSTRIN
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -99,7 +99,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GBALLOC_HL_GLOBAL_MOCK_HOOK();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/hresult_to_string_ut/hresult_to_string_ut_pch.h b/tests/hresult_to_string_ut/hresult_to_string_ut_pch.h
index aef724b..5ae4828 100644
--- a/tests/hresult_to_string_ut/hresult_to_string_ut_pch.h
+++ b/tests/hresult_to_string_ut/hresult_to_string_ut_pch.h
@@ -23,6 +23,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
@@ -33,4 +35,4 @@
 
 #include "sf_c_util/hresult_to_string.h"
 
-#endif // HRESULT_TO_STRING_UT_PCH_H
+#endif // HRESULT_TO_STRING_UT_PCH_H
\ No newline at end of file
diff --git a/tests/sf_c_util_reals_ut/CMakeLists.txt b/tests/sf_c_util_reals_ut/CMakeLists.txt
index e5a3cf9..3ae52cd 100644
--- a/tests/sf_c_util_reals_ut/CMakeLists.txt
+++ b/tests/sf_c_util_reals_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName sf_c_util_reals_ut)
@@ -7,7 +7,7 @@ set(${theseTestsName}_test_files
     ${theseTestsName}.c
 )
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util sf_c_util sf_c_util_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util sf_c_util sf_c_util_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/sf_c_util_reals_ut_pch.h")
 
 if("${building}" STREQUAL "exe")
diff --git a/tests/sf_c_util_reals_ut/sf_c_util_reals_ut_pch.h b/tests/sf_c_util_reals_ut/sf_c_util_reals_ut_pch.h
index 4e89d64..413c480 100644
--- a/tests/sf_c_util_reals_ut/sf_c_util_reals_ut_pch.h
+++ b/tests/sf_c_util_reals_ut/sf_c_util_reals_ut_pch.h
@@ -9,6 +9,7 @@
 #include <stddef.h>                   // for NULL
 
 #include "testrunnerswitcher.h"
+#include "c_pal/timed_test_suite.h"
 
 #define REGISTER_GLOBAL_MOCK_HOOK(original, real) \
     (original == real) ? (void)0 : (void)1;
@@ -42,4 +43,4 @@
 #include "sf_c_util/fc_erd_argc_argv.h"
 #include "sf_c_util/fc_erdl_argc_argv.h"
 
-#endif // SF_C_UTIL_REALS_UT_PCH_H
+#endif // SF_C_UTIL_REALS_UT_PCH_H
\ No newline at end of file
diff --git a/tests/sf_service_config_ut/CMakeLists.txt b/tests/sf_service_config_ut/CMakeLists.txt
index 1209fb6..e9e8728 100644
--- a/tests/sf_service_config_ut/CMakeLists.txt
+++ b/tests/sf_service_config_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName sf_service_config_ut)
@@ -19,5 +19,5 @@ test_sf_service_config.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS debug FabricUUIDD optimized FabricUUID c_pal_reals c_util_reals c_util_test_helpers
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal debug FabricUUIDD optimized FabricUUID c_pal_reals c_util_reals c_util_test_helpers
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/sf_service_config_ut_pch.h")
diff --git a/tests/sf_service_config_ut/sf_service_config_ut.c b/tests/sf_service_config_ut/sf_service_config_ut.c
index 3d8dd01..74fb183 100644
--- a/tests/sf_service_config_ut/sf_service_config_ut.c
+++ b/tests/sf_service_config_ut/sf_service_config_ut.c
@@ -78,7 +78,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -104,7 +104,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     rc_string_test_init_statics();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 
diff --git a/tests/sf_service_config_ut/sf_service_config_ut_pch.h b/tests/sf_service_config_ut/sf_service_config_ut_pch.h
index 60bfb9b..28a51db 100644
--- a/tests/sf_service_config_ut/sf_service_config_ut_pch.h
+++ b/tests/sf_service_config_ut/sf_service_config_ut_pch.h
@@ -23,6 +23,8 @@
 #include "umock_c/umocktypes_wcharptr.h"
 #include "umock_c/umock_c_negative_tests.h"
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
@@ -47,4 +49,4 @@
 
 #include "sf_c_util/sf_service_config.h"
 
-#endif // SF_SERVICE_CONFIG_UT_PCH_H
+#endif // SF_SERVICE_CONFIG_UT_PCH_H
\ No newline at end of file