Imported Upstream version 1.0.0.9910upstream/1.0.0.9910

1116 files changed, 1320 insertions, 4004 deletions

diff --git a/src/pal/tests/palsuite/CMakeLists.txt b/src/pal/tests/palsuite/CMakeLists.txt
index 235b695..0ea8969 100644
--- a/src/pal/tests/palsuite/CMakeLists.txt
+++ b/src/pal/tests/palsuite/CMakeLists.txt
@@ -4,6 +4,16 @@ project(PALTESTSUITE)
 
 include_directories(${PALTESTSUITE_SOURCE_DIR}/common)
 
+# All test will link against these libraries:
+# pthread and m are part of the Android C library (bionic),
+# so we don't need to link them seperately
+if(NOT CLR_CMAKE_PLATFORM_ANDROID)
+  list(APPEND COMMON_TEST_LIBRARIES pthread)
+  list(APPEND COMMON_TEST_LIBRARIES m)
+endif()
+
+list(APPEND COMMON_TEST_LIBRARIES coreclrpal)
+
 add_compile_options(-Wno-incompatible-pointer-types-discards-qualifiers)
 add_compile_options(-Wno-int-to-void-pointer-cast)
 
diff --git a/src/pal/tests/palsuite/c_runtime/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/CMakeLists.txt
index cf06253..7a6b2cd 100644
--- a/src/pal/tests/palsuite/c_runtime/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/CMakeLists.txt
@@ -148,7 +148,6 @@ add_subdirectory(_fullpath)
 # TODO: make this test compile
 # add_subdirectory(_gcvt)
 
-add_subdirectory(_getw)
 add_subdirectory(_isnan)
 add_subdirectory(_isnanf)
 add_subdirectory(_itow)
@@ -157,7 +156,6 @@ add_subdirectory(_mbsinc)
 add_subdirectory(_mbsninc)
 add_subdirectory(_open_osfhandle)
 add_subdirectory(_putenv)
-add_subdirectory(_putw)
 add_subdirectory(_rotl)
 add_subdirectory(_rotr)
 add_subdirectory(_snprintf_s)
@@ -165,7 +163,7 @@ add_subdirectory(_snwprintf_s)
 add_subdirectory(_stricmp)
 add_subdirectory(_strlwr)
 add_subdirectory(_strnicmp)
-add_subdirectory(_vsnprintf)
+add_subdirectory(_vsnprintf_s)
 add_subdirectory(_vsnwprintf_s)
 add_subdirectory(_wcsicmp)
 add_subdirectory(_wcslwr)
diff --git a/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt
index b4421e7..4dd4cf1 100644
--- a/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_iscsym_test1
 add_dependencies(paltest_iscsym_test1 coreclrpal)
 
 target_link_libraries(paltest_iscsym_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt
index 434633b..97a351c 100644
--- a/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_alloca_test1
 add_dependencies(paltest_alloca_test1 coreclrpal)
 
 target_link_libraries(paltest_alloca_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt
index e78a802..152271c 100644
--- a/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_ecvt_test1
 add_dependencies(paltest_ecvt_test1 coreclrpal)
 
 target_link_libraries(paltest_ecvt_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt
index 60b036f..a389b83 100644
--- a/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fdopen_test1
 add_dependencies(paltest_fdopen_test1 coreclrpal)
 
 target_link_libraries(paltest_fdopen_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt
index ac2f25d..a376d45 100644
--- a/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_finite_test1
 add_dependencies(paltest_finite_test1 coreclrpal)
 
 target_link_libraries(paltest_finite_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt
index 9ef630f..a9785e0 100644
--- a/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_finitef_test1
 add_dependencies(paltest_finitef_test1 coreclrpal)
 
 target_link_libraries(paltest_finitef_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt
index 0c9029f..2915738 100644
--- a/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fullpath_test1
 add_dependencies(paltest_fullpath_test1 coreclrpal)
 
 target_link_libraries(paltest_fullpath_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt
index 47dcb95..25c652d 100644
--- a/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_gcvt_test1
 add_dependencies(paltest_gcvt_test1 coreclrpal)
 
 target_link_libraries(paltest_gcvt_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt
index 5b0f560..b77bff9 100644
--- a/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_gcvt_test2
 add_dependencies(paltest_gcvt_test2 coreclrpal)
 
 target_link_libraries(paltest_gcvt_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_getw/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_getw/CMakeLists.txt
deleted file mode 100644
index f6aa0cb..0000000
--- a/src/pal/tests/palsuite/c_runtime/_getw/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-add_subdirectory(test1)
-
diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt
deleted file mode 100644
index 4f763be..0000000
--- a/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SOURCES
-  test1.cpp
-)
-
-add_executable(paltest_getw_test1
-  ${SOURCES}
-)
-
-add_dependencies(paltest_getw_test1 coreclrpal)
-
-target_link_libraries(paltest_getw_test1
-  pthread
-  m
-  coreclrpal
-)
diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat b/src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat
deleted file mode 100644
index b20eae0..0000000
--- a/src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat
+++ /dev/null
diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp
deleted file mode 100644
index 34ce4ee..0000000
--- a/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*============================================================================
-**
-** Source:  test1.c
-**
-** Purpose: Several integers are read from a previously written file
-**          using _getw.  The test passes if the values read match those known to
-**          be in the file.
-**
-**
-**==========================================================================*/
-
-#include <palsuite.h>
-
-/*Tests _getw using a previously written data file */
-int __cdecl main(int argc, char **argv)
-{
-    const int testValues[] =
-    {
-        0,
-        1,
-        -1,
-        0x7FFFFFFF,            /* largest positive integer on 32 bit systems */
-        0x80000000,            /* largest negative integer on 32 bit systems */
-        0xFFFFFFFF,
-        0xFFFFAAAA
-    };
-
-    int i = 0;
-    int input = 0;
-
-    const char filename[] = "test.dat";
-
-
-    FILE *fp = NULL;
-
-    /*
-     * Initialize the PAL and return FAIL if this fails
-     */
-    if (0 != (PAL_Initialize(argc, argv)))
-    {
-        return FAIL;
-    }
-
-    /* write the file that we will use to test */
-
-
-    /*
-      Don't uncomment this code, it was used to create the data file
-      initially on windows, but if it is run on all test platforms, the
-      tests will always pass.
-
-      fp = fopen(filename, "w");
-      if (fp == NULL)
-      {
-      Fail("Unable to open file for write.\n");
-      }
-      for (i = 0; i < sizeof(testValues) / sizeof(testValues[0]); i++)
-      {
-      _putw(testValues[i], fp);
-      }
-
-      if (fclose(fp) != 0)
-      {
-      Fail("Error closing file after writing to it with _putw.\n");
-      }
-    */
-
-
-    /*Now read values back from the file and see if they match.*/
-    fp = fopen(filename, "r");
-    if (fp == NULL)
-    {
-        Fail ("Unable to open file for read.\n");
-    }
-    for (i = 0; i < sizeof(testValues) / sizeof(testValues[0]); i++)
-    {
-        input = _getw(fp);
-        if (VAL32(input) != testValues[i])
-        {
-            Fail ("_getw did not get the expected values when reading "
-                    "from a file.\n");
-        }
-    }
-
-    if (fclose(fp) != 0)
-    {
-        Fail ("Error closing file after reading from it with _getw\n");
-    }
-    PAL_Terminate();
-    return PASS;
-}
-
diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_getw/test1/testinfo.dat
deleted file mode 100644
index 4044dad..0000000
--- a/src/pal/tests/palsuite/c_runtime/_getw/test1/testinfo.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-Version = 1.0
-Section = C Runtime
-Function = _getw
-Name = Positive Test for _getw
-TYPE = DEFAULT
-EXE1 = test1
-Description
-=Several integers are read from a previously written file
-=using _getw.  The test passes if the values read match those known to
-=be in the file.
-
diff --git a/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt
index 106ccb9..8c949ed 100644
--- a/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isnan_test1
 add_dependencies(paltest_isnan_test1 coreclrpal)
 
 target_link_libraries(paltest_isnan_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt
index a8d42aa..485c30e 100644
--- a/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isnanf_test1
 add_dependencies(paltest_isnanf_test1 coreclrpal)
 
 target_link_libraries(paltest_isnanf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt
index 2c5d57b..bbeeb48 100644
--- a/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_itow_test1
 add_dependencies(paltest_itow_test1 coreclrpal)
 
 target_link_libraries(paltest_itow_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt
index b016f27..96319ac 100644
--- a/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_mbsdec_test1
 add_dependencies(paltest_mbsdec_test1 coreclrpal)
 
 target_link_libraries(paltest_mbsdec_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt
index c7325b9..7e3a015 100644
--- a/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_mbsinc_test1
 add_dependencies(paltest_mbsinc_test1 coreclrpal)
 
 target_link_libraries(paltest_mbsinc_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt
index 81c6c23..26a44c9 100644
--- a/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_mbsninc_test1
 add_dependencies(paltest_mbsninc_test1 coreclrpal)
 
 target_link_libraries(paltest_mbsninc_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt
index f4fedb6..503a6d9 100644
--- a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_open_osfhandle_test1
 add_dependencies(paltest_open_osfhandle_test1 coreclrpal)
 
 target_link_libraries(paltest_open_osfhandle_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt
index 6086868..e37cec2 100644
--- a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_open_osfhandle_test2
 add_dependencies(paltest_open_osfhandle_test2 coreclrpal)
 
 target_link_libraries(paltest_open_osfhandle_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt
index 9096bc1..e49d53f 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_putenv_test1
 add_dependencies(paltest_putenv_test1 coreclrpal)
 
 target_link_libraries(paltest_putenv_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt
index ad99eba..6c6d139 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_putenv_test2
 add_dependencies(paltest_putenv_test2 coreclrpal)
 
 target_link_libraries(paltest_putenv_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt
index fc97b95..2d98fd1 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_putenv_test3
 add_dependencies(paltest_putenv_test3 coreclrpal)
 
 target_link_libraries(paltest_putenv_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt
index 3881626..9bcd973 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_putenv_test4
 add_dependencies(paltest_putenv_test4 coreclrpal)
 
 target_link_libraries(paltest_putenv_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_putw/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putw/CMakeLists.txt
deleted file mode 100644
index f6aa0cb..0000000
--- a/src/pal/tests/palsuite/c_runtime/_putw/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-add_subdirectory(test1)
-
diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt
deleted file mode 100644
index 78833d4..0000000
--- a/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SOURCES
-  test1.cpp
-)
-
-add_executable(paltest_putw_test1
-  ${SOURCES}
-)
-
-add_dependencies(paltest_putw_test1 coreclrpal)
-
-target_link_libraries(paltest_putw_test1
-  pthread
-  m
-  coreclrpal
-)
diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp
deleted file mode 100644
index 02b7cc7..0000000
--- a/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*============================================================================
-**
-** Source:  test1.c
-**
-** Purpose: Writes a series of integers to a file, test.dat,
-**          then verifies the results.
-**
-** Dependency: fopen(...)
-**             fclose(...)
-**             CloseHandle(...) 
-**             DeleteFileA(...)
-**             _getw(...)
-**
-**
-**
-**==========================================================================*/
-
-
-#include <palsuite.h>
-
-const char testFileName[] = "test.dat";
-
-static void Cleanup(HANDLE hFile)
-{
-    if (fclose((PAL_FILE*)hFile))
-    {
-        Trace("_putw: ERROR -> Unable to close file \"%s\".\n", 
-            testFileName);
-    }
-    if (!DeleteFileA(testFileName))
-    {
-        Trace("_putw: ERROR -> Unable to delete file \"%s\". ", 
-            "GetLastError returned %u.\n", 
-            testFileName,
-            GetLastError());
-    }
-}
-
-
-int __cdecl main(int argc, char **argv)
-{
-
-    FILE * pfTest = NULL;
-    int  testArray[] = {0,1,-1,0x7FFFFFFF,0x80000000,0xFFFFFFFF,0xFFFFAAAA};
-    int  i = 0;
-    int  retValue = 0;
-
-    /*
-     *  Initialize the PAL and return FAIL if this fails
-     */
-    if (0 != (PAL_Initialize(argc, argv)))
-    {
-        return FAIL;
-    }
-
-    /*write the file that we will use to test */
-    pfTest = fopen(testFileName, "w");
-    if (pfTest == NULL)
-    {
-        Fail ("Unable to write test file.\n");
-    }
-
-    for (i = 0; i < sizeof(testArray)/sizeof(int) ; i++)
-    {
-        _putw(testArray[i], pfTest);
-
-        if( ferror( pfTest ) )        
-    {
-            Cleanup(pfTest);
-            Fail( "Error:in _putw -> error has occurred in the "
-                "stream while writing to the file: \"test.dat\"\n");
-        }
-      
-    }
-
-    if (fclose(pfTest) != 0)
-    {
-        Cleanup(pfTest);
-        Fail ("Error closing file after writing with _putw(..).\n");
-    }
-
-    /*open the new test file and compare*/
-    pfTest = fopen(testFileName, "r");
-    if (pfTest == NULL)
-    {
-        Fail ("Error opening \"%s\", which is odd, since I just finished "
-                "creating that file.\n", testFileName);
-    }
-    retValue =_getw( pfTest );
-    i = 0;
-    while(retValue != EOF)
-    {
-        if(retValue != testArray[i])
-        {
-            Cleanup(pfTest);
-            Fail ("Integers written by _putw are not in the correct format\n",
-                testFileName);
-        }
-        retValue = _getw( pfTest );
-        i++ ;
-    }
-
-    Cleanup(pfTest);  
-    PAL_Terminate();
-    return PASS;
-}
-
-
diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_putw/test1/testinfo.dat
deleted file mode 100644
index 3007b82..0000000
--- a/src/pal/tests/palsuite/c_runtime/_putw/test1/testinfo.dat
+++ /dev/null
@@ -1,13 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-Version = 1.0
-Section = C Runtime
-Function = _putw
-Name = Positive test for _putw
-TYPE = DEFAULT
-EXE1 = test1
-Description
-= Several integers are written to a new file using _putw.  This file is
-= closed, reopened and read from to verify the writes were successful.
diff --git a/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt
index bafaa23..8aed25d 100644
--- a/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_rotl_test1
 add_dependencies(paltest_rotl_test1 coreclrpal)
 
 target_link_libraries(paltest_rotl_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt
index c0c76fe..ff84c62 100644
--- a/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_rotr_test1
 add_dependencies(paltest_rotr_test1 coreclrpal)
 
 target_link_libraries(paltest_rotr_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt
index 9e4c671..7ec4817 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test1
 add_dependencies(paltest_snprintf_test1 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt
index 57e7fb1..8a61bc4 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test10
 add_dependencies(paltest_snprintf_test10 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt
index 4fc179c..5fe2534 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test11
 add_dependencies(paltest_snprintf_test11 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt
index a35609e..9eade54 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test12
 add_dependencies(paltest_snprintf_test12 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt
index 3bf986e..1e31d2c 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test13
 add_dependencies(paltest_snprintf_test13 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt
index 985303e..1af6846 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test14
 add_dependencies(paltest_snprintf_test14 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt
index c7f5796..8287fd3 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test15
 add_dependencies(paltest_snprintf_test15 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt
index 9a224bc..b45696e 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test16
 add_dependencies(paltest_snprintf_test16 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt
index 3a8a349..60d34eb 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test17
 add_dependencies(paltest_snprintf_test17 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt
index 96e39e8..2bd5200 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test18
 add_dependencies(paltest_snprintf_test18 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt
index be3570f..1d9e283 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test19
 add_dependencies(paltest_snprintf_test19 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt
index 11d18e6..134aeaa 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test2
 add_dependencies(paltest_snprintf_test2 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp
index e586694..54ef80b 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp
@@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest("foo %5.2s", "bar", "foo    ba");
     DoStrTest("foo %-5s", "bar", "foo bar  ");
     DoStrTest("foo %05s", "bar", "foo 00bar");   
+    DoStrTest("foo %s", NULL, "foo (null)");
+    DoStrTest("foo %hs", NULL, "foo (null)");
+    DoWStrTest("foo %ls", NULL, "foo (null)");
+    DoWStrTest("foo %ws", NULL, "foo (null)");
+    DoStrTest("foo %Ls", NULL, "foo (null)");
+    DoStrTest("foo %I64s", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt
index b8d4178..198f725 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test3
 add_dependencies(paltest_snprintf_test3 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp
index 3c52b44..99c25a6 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp
@@ -39,6 +39,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest("foo %5.2S", convert("bar"), "foo    ba");
     DoWStrTest("foo %-5S", convert("bar"), "foo bar  ");
     DoWStrTest("foo %05S", convert("bar"), "foo 00bar");
+    DoWStrTest("foo %S", NULL, "foo (null)");
+    DoStrTest("foo %hS", NULL, "foo (null)");
+    DoWStrTest("foo %lS", NULL, "foo (null)");
+    DoWStrTest("foo %wS", NULL, "foo (null)");
+    DoWStrTest("foo %LS", NULL, "foo (null)");
+    DoWStrTest("foo %I64S", NULL, "foo (null)");
     
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt
index 568b712..81c3c1a 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test4
 add_dependencies(paltest_snprintf_test4 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp
index 216557f..7c06152 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp
@@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[])
 	/*
 	**  Run only on 64 bit platforms
 	*/
-	#if defined(BIT64) && defined(PLATFORM_UNIX)
+	#if defined(BIT64)
 		Trace("Testing for 64 Bit Platforms \n");
 		DoPointerTest("%p", NULL, "NULL", "0000000000000000"); 
 		DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456");
@@ -61,7 +61,7 @@ int __cdecl main(int argc, char *argv[])
 		DoPointerTest("%Lp", ptr, "pointer to 0x123456", "00123456");
 		DoI64Test("%I64p", lptr, "pointer to 0x1234567887654321",
 				"1234567887654321");
-	#endif //defined(BIT64) && defined(PLATFORM_UNIX)
+	#endif //defined(BIT64)
 
 	PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt
index 820cc66..08ead96 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test6
 add_dependencies(paltest_snprintf_test6 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt
index a2af7c4..71564ea 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test7
 add_dependencies(paltest_snprintf_test7 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt
index 53545c5..3778833 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test8
 add_dependencies(paltest_snprintf_test8 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt
index 33ca9db..90a5403 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test9
 add_dependencies(paltest_snprintf_test9 coreclrpal)
 
 target_link_libraries(paltest_snprintf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt
index eac86f3..89496c5 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test1
 add_dependencies(paltest_snwprintf_test1 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt
index 82ee739..60703fa 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test10
 add_dependencies(paltest_snwprintf_test10 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt
index f7d7845..c305c62 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test11
 add_dependencies(paltest_snwprintf_test11 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt
index 5b926fb..9532e67 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test12
 add_dependencies(paltest_snwprintf_test12 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt
index 52a3c75..f108800 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test13
 add_dependencies(paltest_snwprintf_test13 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt
index d557a30..79a0432 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test14
 add_dependencies(paltest_snwprintf_test14 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt
index 2e5ee36..c29ec7d 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test15
 add_dependencies(paltest_snwprintf_test15 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt
index f4ce409..d427266 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test16
 add_dependencies(paltest_snwprintf_test16 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt
index 159e15d..37fb790 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test17
 add_dependencies(paltest_snwprintf_test17 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt
index 5964e84..a880738 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test18
 add_dependencies(paltest_snwprintf_test18 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt
index 5d84847..cb16e1e 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test19
 add_dependencies(paltest_snwprintf_test19 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt
index ea33d48..4307aa7 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test2
 add_dependencies(paltest_snwprintf_test2 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp
index 86bfdc9..7d8dd65 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp
@@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest(convert("foo %5.2s"), convert("bar"), convert("foo    ba"));
     DoWStrTest(convert("foo %-5s"), convert("bar"), convert("foo bar  "));
     DoWStrTest(convert("foo %05s"), convert("bar"), convert("foo 00bar"));
+    DoWStrTest(convert("foo %s"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %hs"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %ls"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %ws"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %Ls"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %I64s"), NULL, convert("foo (null)"));
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt
index 5095b1a..c5278f4 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test3
 add_dependencies(paltest_snwprintf_test3 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp
index f6db6f2..b4a4a32 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp
@@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest(convert("foo %5.2S"), "bar", convert("foo    ba"));
     DoStrTest(convert("foo %-5S"), "bar", convert("foo bar  "));
     DoStrTest(convert("foo %05S"), "bar", convert("foo 00bar"));
+    DoStrTest(convert("foo %S"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %hS"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %lS"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %wS"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %LS"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %I64S"), NULL, convert("foo (null)"));
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt
index 9cf81ea..26229d7 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test4
 add_dependencies(paltest_snwprintf_test4 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp
index 02d4781..0819a7e 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp
@@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[])
 /*
 **  Run only on 64 bit platforms
 */
-#if defined(BIT64) && defined(PLATFORM_UNIX)
+#if defined(BIT64)
 	Trace("Testing for 64 Bit Platforms \n");
 	DoPointerTest(convert("%p"), NULL, convert("0000000000000000"));
     DoPointerTest(convert("%p"), ptr, convert("0000000000123456"));
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt
index 4996c77..542e943 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test6
 add_dependencies(paltest_snwprintf_test6 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt
index 0e55fbf..0905c5d 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test7
 add_dependencies(paltest_snwprintf_test7 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt
index 8f7fbda..a31a7f9 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test8
 add_dependencies(paltest_snwprintf_test8 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt
index f769c9e..90157fd 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test9
 add_dependencies(paltest_snwprintf_test9 coreclrpal)
 
 target_link_libraries(paltest_snwprintf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt
index 03aa3a5..a0380a4 100644
--- a/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_stricmp_test1
 add_dependencies(paltest_stricmp_test1 coreclrpal)
 
 target_link_libraries(paltest_stricmp_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt
index ca26961..bef0a7e 100644
--- a/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_strlwr_test1
 add_dependencies(paltest_strlwr_test1 coreclrpal)
 
 target_link_libraries(paltest_strlwr_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt
index 03f9992..2429339 100644
--- a/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_strnicmp_test1
 add_dependencies(paltest_strnicmp_test1 coreclrpal)
 
 target_link_libraries(paltest_strnicmp_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt
deleted file mode 100644
index 9254054..0000000
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SOURCES
-  test5.cpp
-)
-
-add_executable(paltest_vsnprintf_test5
-  ${SOURCES}
-)
-
-add_dependencies(paltest_vsnprintf_test5 coreclrpal)
-
-target_link_libraries(paltest_vsnprintf_test5
-  pthread
-  m
-  coreclrpal
-)
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp
deleted file mode 100644
index 534e42e..0000000
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*=====================================================================
-**
-** Source:    test5.c
-**
-** Purpose:   Test #5 for the _vsnprintf function.
-**
-**
-**===================================================================*/
-
-#include <palsuite.h>
-#include "../_vsnprintf.h"
-
-/*
- * Notes: memcmp is used, as is strlen.
- */
-
-static void DoTest(char *formatstr, int param, char *checkstr)
-{
-    char buf[256] = { 0 };
-    int n = -1;
-    
-    Testvsnprintf(buf, 256, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
-             param, n);
-    }
-    if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf);
-    }    
-}
-
-static void DoShortTest(char *formatstr, int param, char *checkstr)
-{
-    char buf[256] = { 0 };
-    short int n = -1;
-    
-    Testvsnprintf(buf, 256, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
-             param, n);
-    }
-    if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf);
-    }    
-}
-
-int __cdecl main(int argc, char *argv[])
-{    
-    if (PAL_Initialize(argc, argv) != 0)
-    {
-        return(FAIL);
-    }
-
-    DoTest("foo %n bar", 4, "foo  bar");
-    DoTest("foo %#n bar", 4, "foo  bar");
-    DoTest("foo % n bar", 4, "foo  bar");
-    DoTest("foo %+n bar", 4, "foo  bar");
-    DoTest("foo %-n bar", 4, "foo  bar");
-    DoTest("foo %0n bar", 4, "foo  bar");
-    DoShortTest("foo %hn bar", 4, "foo  bar");
-    DoTest("foo %ln bar", 4, "foo  bar");
-    DoTest("foo %Ln bar", 4, "foo  bar");
-    DoTest("foo %I64n bar", 4, "foo  bar");
-    DoTest("foo %20.3n bar", 4, "foo  bar");
-
-    PAL_Terminate();
-    return PASS;
-}
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat
deleted file mode 100644
index c384882..0000000
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-Version = 1.0
-Section = C Runtime
-Function = _vsnprintf
-Name = Positive Test for _vsnprintf
-TYPE = DEFAULT
-EXE1 = test5
-Description
-= Tests the PAL implementation of the _vsnprintf function.
-= Tests _vsnprintf with the count specifier.
-= This test is modeled after sprintf_s.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt
index cafb953..8fe1cb6 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt
@@ -14,7 +14,6 @@ add_subdirectory(test19)
 add_subdirectory(test2)
 add_subdirectory(test3)
 add_subdirectory(test4)
-add_subdirectory(test5)
 add_subdirectory(test6)
 add_subdirectory(test7)
 add_subdirectory(test8)
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h
index 30e7064..7c81136 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h
@@ -4,7 +4,7 @@
 
 /*============================================================================
 **
-** Source:  _vsnprintf.h
+** Source:  _vsnprintf_s.h
 **
 ** Purpose: Contains common testing functions for _vsnprintf
 **
@@ -21,7 +21,7 @@ int Testvsnprintf(char* buf, size_t count, const char* format, ...)
     va_list arglist;
 
     va_start(arglist, format);
-    retVal = _vsnprintf(buf, count, format, arglist);
+    retVal = _vsnprintf_s(buf, count, _TRUNCATE, format, arglist);
     va_end(arglist);
 
     return (retVal);
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt
index 489b7bf..ee97f2b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test1
 add_dependencies(paltest_vsnprintf_test1 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp
index 88aeec2..db70f56 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
@@ -45,11 +45,11 @@ int __cdecl main(int argc, char *argv[])
     {
         Fail("ERROR: expected negative return value, got %d", ret);
     }
-    if (memcmp(checkstr, buf, 8) != 0 || buf[8] != 'x')
+    if (memcmp(checkstr, buf, 7) != 0 || buf[7] != 0)
     {
         Fail("ERROR: expected %s (up to %d chars), got %s\n", checkstr, 8, buf);
     }
-    
+
     PAL_Terminate();
     return PASS;
 }
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat
index f96bf08..f96bf08 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt
index bc35dbd..ad067cc 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test10
 add_dependencies(paltest_vsnprintf_test10 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp
index 3099957..707a91c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
  
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat
index a3d8eca..a3d8eca 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt
index bf3dd9a..9fb2b90 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test11
 add_dependencies(paltest_vsnprintf_test11 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp
index 74b0435..4c710e5 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat
index 17e9f04..17e9f04 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt
index 9fceeaf..f78711c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test12
 add_dependencies(paltest_vsnprintf_test12 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp
index 3718620..528e658 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/  
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat
index 82f58e4..82f58e4 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt
index 7e805f6..b37300c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test13
 add_dependencies(paltest_vsnprintf_test13 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp
index 1abada4..645a118 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/   
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat
index d308edf..d308edf 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt
index 6e4566b..97098d4 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test14
 add_dependencies(paltest_vsnprintf_test14 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp
index 2e98f6a..05965f0 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/   
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat
index 8d11b1d..8d11b1d 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt
index d9039b3..95e5a47 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test15
 add_dependencies(paltest_vsnprintf_test15 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp
index 4d32e9c..cd34f74 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/   
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat
index 9139125..9139125 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt
index b298df3..1fd8866 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test16
 add_dependencies(paltest_vsnprintf_test16 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp
index 118ba14..de9b74f 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat
index fc2f130..fc2f130 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt
index b195f33..ffd52ca 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test17
 add_dependencies(paltest_vsnprintf_test17 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp
index 9b5063d..3304eda 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat
index aeb9244..aeb9244 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt
index f0f6d11..1bd8e3b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test18
 add_dependencies(paltest_vsnprintf_test18 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp
index 5232bef..14ad8f5 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat
index 57aaed5..57aaed5 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt
index 44b3890..3848c13 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test19
 add_dependencies(paltest_vsnprintf_test19 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp
index 211354b..6f2aefa 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat
index cda8966..cda8966 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt
index 1d3910e..5bdf0ac 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test2
 add_dependencies(paltest_vsnprintf_test2 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp
index 4bac4d2..e5808f3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
  
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 /*
  * Notes: memcmp is used, as is strlen.
  */
@@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest("foo %5.2s", "bar", "foo    ba");
     DoStrTest("foo %-5s", "bar", "foo bar  ");
     DoStrTest("foo %05s", "bar", "foo 00bar");   
+    DoStrTest("foo %s", NULL, "foo (null)");
+    DoStrTest("foo %hs", NULL, "foo (null)");
+    DoWStrTest("foo %ls", NULL, "foo (null)");
+    DoWStrTest("foo %ws", NULL, "foo (null)");
+    DoStrTest("foo %Ls", NULL, "foo (null)");
+    DoStrTest("foo %I64s", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat
index 6e8f03e..6e8f03e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt
index 62d765e..7268cf1 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test3
 add_dependencies(paltest_vsnprintf_test3 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp
index 2b30c9a..bb8b153 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
@@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest("foo %5.2S", convert("bar"), "foo    ba");
     DoWStrTest("foo %-5S", convert("bar"), "foo bar  ");
     DoWStrTest("foo %05S", convert("bar"), "foo 00bar");
+    DoWStrTest("foo %S", NULL, "foo (null)");
+    DoStrTest("foo %hS", NULL, "foo (null)");
+    DoWStrTest("foo %lS", NULL, "foo (null)");
+    DoWStrTest("foo %wS", NULL, "foo (null)");
+    DoWStrTest("foo %LS", NULL, "foo (null)");
+    DoWStrTest("foo %I64S", NULL, "foo (null)");
     
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat
index 638cef6..638cef6 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt
index 5662bd5..f241947 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test4
 add_dependencies(paltest_vsnprintf_test4 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp
index 33fc49d..c4a77f9 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
@@ -58,7 +58,7 @@ int __cdecl main(int argc, char *argv[])
 	/*
 **  Run only on 64 bit platforms
 */
-#if defined(BIT64) && defined(PLATFORM_UNIX)
+#if defined(BIT64)
 	Trace("Testing for 64 Bit Platforms \n");
 	DoPointerTest("%p", NULL, "NULL", "0000000000000000");
     DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456");
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat
index 03ff293..03ff293 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt
index d80d433..3c6b43f 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test6
 add_dependencies(paltest_vsnprintf_test6 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp
index 103d118..cbcead8 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat
index e375f92..e375f92 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt
index a1dc0a7..6708b39 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test7
 add_dependencies(paltest_vsnprintf_test7 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp
index c7e45d6..4843d27 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
     
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 /*
  * Notes: memcmp is used, as is strlen.
  */
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat
index 09eb481..09eb481 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt
index 1ca4732..8a396fd 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test8
 add_dependencies(paltest_vsnprintf_test8 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp
index 2cefbea..8021a79 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat
index 1bdf411..1bdf411 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt
index 583971f..136856b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test9
 add_dependencies(paltest_vsnprintf_test9 coreclrpal)
 
 target_link_libraries(paltest_vsnprintf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp
index d2cd816..d36846e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat
index bdaae87..bdaae87 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt
index d124516..0138111 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test1
 add_dependencies(paltest_vsnwprintf_test1 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt
index 6367964..e669b1e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test10
 add_dependencies(paltest_vsnwprintf_test10 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt
index b45fd0e..acb914b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test11
 add_dependencies(paltest_vsnwprintf_test11 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt
index 2a15b19..0d83d5b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test12
 add_dependencies(paltest_vsnwprintf_test12 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt
index 01ab97c..27f3740 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test13
 add_dependencies(paltest_vsnwprintf_test13 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt
index c6c9903..6e0a35e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test14
 add_dependencies(paltest_vsnwprintf_test14 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt
index e1a32b1..f13b1f2 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test15
 add_dependencies(paltest_vsnwprintf_test15 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt
index 9e2b25b..2b45d4c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test16
 add_dependencies(paltest_vsnwprintf_test16 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt
index 2d8ba31..a4cc151 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test17
 add_dependencies(paltest_vsnwprintf_test17 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt
index 503856c..9bf17f3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test18
 add_dependencies(paltest_vsnwprintf_test18 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt
index 68485ef..7f95eb1 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test19
 add_dependencies(paltest_vsnwprintf_test19 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt
index a512be6..27231e9 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test2
 add_dependencies(paltest_vsnwprintf_test2 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp
index 18e5adf..b2958df 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp
@@ -34,6 +34,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest(convert("foo %5.2s"), convert("bar"), convert("foo    ba"));
     DoWStrTest(convert("foo %-5s"), convert("bar"), convert("foo bar  "));
     DoWStrTest(convert("foo %05s"), convert("bar"), convert("foo 00bar"));
+    DoWStrTest(convert("foo %s"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %hs"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %ls"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %ws"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %Ls"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %I64s"), NULL, convert("foo (null)"));
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt
index 7991c25..205e5a5 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test3
 add_dependencies(paltest_vsnwprintf_test3 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp
index 5e2bfa2..657a911 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp
@@ -34,6 +34,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest(convert("foo %5.2S"), "bar", convert("foo    ba"));
     DoStrTest(convert("foo %-5S"), "bar", convert("foo bar  "));
     DoStrTest(convert("foo %05S"), "bar", convert("foo 00bar"));
+    DoStrTest(convert("foo %S"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %hS"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %lS"), NULL, convert("foo (null)"));
+    DoWStrTest(convert("foo %wS"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %LS"), NULL, convert("foo (null)"));
+    DoStrTest(convert("foo %I64S"), NULL, convert("foo (null)"));
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt
index 18f5d02..fd2666e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test4
 add_dependencies(paltest_vsnwprintf_test4 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp
index 3627ff8..006e154 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp
@@ -64,7 +64,7 @@ int __cdecl main(int argc, char *argv[])
 /*
 **  Run only on 64 bit platforms
 */
-#if defined(BIT64) && defined(PLATFORM_UNIX)
+#if defined(BIT64)
     Trace("Testing for 64 Bit Platforms \n");
     DoPointerTest(convert("%p"), NULL, convert("NULL"), convert("00000000"));
     DoPointerTest(convert("%p"), ptr, convert("pointer to 0x123456"),
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt
index c431da4..1ff1221 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test6
 add_dependencies(paltest_vsnwprintf_test6 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt
index 5759b83..fe46de4 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test7
 add_dependencies(paltest_vsnwprintf_test7 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt
index 5e8a628..7ce0aa8 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test8
 add_dependencies(paltest_vsnwprintf_test8 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt
index 323365d..69a9de3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test9
 add_dependencies(paltest_vsnwprintf_test9 coreclrpal)
 
 target_link_libraries(paltest_vsnwprintf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt
index 023b777..1a70e34 100644
--- a/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wcsicmp_test1
 add_dependencies(paltest_wcsicmp_test1 coreclrpal)
 
 target_link_libraries(paltest_wcsicmp_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt
index b9df132..b10e14c 100644
--- a/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wcslwr_test1
 add_dependencies(paltest_wcslwr_test1 coreclrpal)
 
 target_link_libraries(paltest_wcslwr_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt
index ea22daa..3fa3b38 100644
--- a/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wcsnicmp_test1
 add_dependencies(paltest_wcsnicmp_test1 coreclrpal)
 
 target_link_libraries(paltest_wcsnicmp_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt
index f7aa22d..35498c0 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test1
 add_dependencies(paltest_wfopen_test1 coreclrpal)
 
 target_link_libraries(paltest_wfopen_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt
index 3159889..5a04944 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test2
 add_dependencies(paltest_wfopen_test2 coreclrpal)
 
 target_link_libraries(paltest_wfopen_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt
index 06d0941..1a1656e 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test3
 add_dependencies(paltest_wfopen_test3 coreclrpal)
 
 target_link_libraries(paltest_wfopen_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt
index 8253d75..bc56cd9 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test4
 add_dependencies(paltest_wfopen_test4 coreclrpal)
 
 target_link_libraries(paltest_wfopen_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt
index 8b3d064..42caa20 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test5
 add_dependencies(paltest_wfopen_test5 coreclrpal)
 
 target_link_libraries(paltest_wfopen_test5
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt
index bf1eaec..c2fb9e7 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test6
 add_dependencies(paltest_wfopen_test6 coreclrpal)
 
 target_link_libraries(paltest_wfopen_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt
index 5d04528..13f7b00 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test7
 add_dependencies(paltest_wfopen_test7 coreclrpal)
 
 target_link_libraries(paltest_wfopen_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt
index ed02fec..b04d4ab 100644
--- a/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_wtoi_test1
 add_dependencies(paltest_wtoi_test1 coreclrpal)
 
 target_link_libraries(paltest_wtoi_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt
index b01d97f..c09c039 100644
--- a/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_abs_test1
 add_dependencies(paltest_abs_test1 coreclrpal)
 
 target_link_libraries(paltest_abs_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt
index 5bd3ae0..7f473d0 100644
--- a/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_acos_test1
 add_dependencies(paltest_acos_test1 coreclrpal)
 
 target_link_libraries(paltest_acos_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt
index 2643647..095be95 100644
--- a/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_acosf_test1
 add_dependencies(paltest_acosf_test1 coreclrpal)
 
 target_link_libraries(paltest_acosf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt
index 510b543..3537fe6 100644
--- a/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_asin_test1
 add_dependencies(paltest_asin_test1 coreclrpal)
 
 target_link_libraries(paltest_asin_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt
index b167bd8..46661a7 100644
--- a/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_asinf_test1
 add_dependencies(paltest_asinf_test1 coreclrpal)
 
 target_link_libraries(paltest_asinf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt
index ace64e4..ef6cca7 100644
--- a/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_atan_test1
 add_dependencies(paltest_atan_test1 coreclrpal)
 
 target_link_libraries(paltest_atan_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt
index cafa09f..4246b37 100644
--- a/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_atan2_test1
 add_dependencies(paltest_atan2_test1 coreclrpal)
 
 target_link_libraries(paltest_atan2_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt
index d71a61b..d70946e 100644
--- a/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_atan2f_test1
 add_dependencies(paltest_atan2f_test1 coreclrpal)
 
 target_link_libraries(paltest_atan2f_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt
index b71b1cf..2a08f6d 100644
--- a/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_atanf_test1
 add_dependencies(paltest_atanf_test1 coreclrpal)
 
 target_link_libraries(paltest_atanf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt
index 12e584b..4917e42 100644
--- a/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_atof_test1
 add_dependencies(paltest_atof_test1 coreclrpal)
 
 target_link_libraries(paltest_atof_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt
index 2250522..d545811 100644
--- a/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_atoi_test1
 add_dependencies(paltest_atoi_test1 coreclrpal)
 
 target_link_libraries(paltest_atoi_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt
index 29643aa..0335137 100644
--- a/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_atol_test1
 add_dependencies(paltest_atol_test1 coreclrpal)
 
 target_link_libraries(paltest_atol_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt
index c5aab7b..a1242e6 100644
--- a/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_bsearch_test1
 add_dependencies(paltest_bsearch_test1 coreclrpal)
 
 target_link_libraries(paltest_bsearch_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt
index 7ad33b1..167b8aa 100644
--- a/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_bsearch_test2
 add_dependencies(paltest_bsearch_test2 coreclrpal)
 
 target_link_libraries(paltest_bsearch_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt
index f834914..c1473da 100644
--- a/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_ceil_test1
 add_dependencies(paltest_ceil_test1 coreclrpal)
 
 target_link_libraries(paltest_ceil_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt
index 64f14cd..b1fbe07 100644
--- a/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_ceilf_test1
 add_dependencies(paltest_ceilf_test1 coreclrpal)
 
 target_link_libraries(paltest_ceilf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt
index 536664c..936a876 100644
--- a/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_cos_test1
 add_dependencies(paltest_cos_test1 coreclrpal)
 
 target_link_libraries(paltest_cos_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt
index b3a18ea..db4efe4 100644
--- a/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_cosf_test1
 add_dependencies(paltest_cosf_test1 coreclrpal)
 
 target_link_libraries(paltest_cosf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt
index e1fff0e..ec8038a 100644
--- a/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_cosh_test1
 add_dependencies(paltest_cosh_test1 coreclrpal)
 
 target_link_libraries(paltest_cosh_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt
index 92fcfde..3b873ee 100644
--- a/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_coshf_test1
 add_dependencies(paltest_coshf_test1 coreclrpal)
 
 target_link_libraries(paltest_coshf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt
index 3eeffb0..b7d1b99 100644
--- a/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_ctime_test1
 add_dependencies(paltest_ctime_test1 coreclrpal)
 
 target_link_libraries(paltest_ctime_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt
index 91b8d09..8c27c78 100644
--- a/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_errno_test1
 add_dependencies(paltest_errno_test1 coreclrpal)
 
 target_link_libraries(paltest_errno_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt
index ab7c4a2..e66c359 100644
--- a/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_errno_test2
 add_dependencies(paltest_errno_test2 coreclrpal)
 
 target_link_libraries(paltest_errno_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt
index bb2cbcc..3f34da6 100644
--- a/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_exit_test1
 add_dependencies(paltest_exit_test1 coreclrpal)
 
 target_link_libraries(paltest_exit_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt
index 8a74e75..5327b57 100644
--- a/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_exit_test2
 add_dependencies(paltest_exit_test2 coreclrpal)
 
 target_link_libraries(paltest_exit_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt
index 3377ed2..a285658 100644
--- a/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_exp_test1
 add_dependencies(paltest_exp_test1 coreclrpal)
 
 target_link_libraries(paltest_exp_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt
index fb12b65..5ff0d09 100644
--- a/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_expf_test1
 add_dependencies(paltest_expf_test1 coreclrpal)
 
 target_link_libraries(paltest_expf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt
index fa01a34..9dab679 100644
--- a/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fabs_test1
 add_dependencies(paltest_fabs_test1 coreclrpal)
 
 target_link_libraries(paltest_fabs_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt
index a1823e2..dc46a23 100644
--- a/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fabsf_test1
 add_dependencies(paltest_fabsf_test1 coreclrpal)
 
 target_link_libraries(paltest_fabsf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt
index 64cfef0..5fe80e0 100644
--- a/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fclose_test1
 add_dependencies(paltest_fclose_test1 coreclrpal)
 
 target_link_libraries(paltest_fclose_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt
index 3b55386..efe4c85 100644
--- a/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fclose_test2
 add_dependencies(paltest_fclose_test2 coreclrpal)
 
 target_link_libraries(paltest_fclose_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt
index 9f68950..e870038 100644
--- a/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_feof_test1
 add_dependencies(paltest_feof_test1 coreclrpal)
 
 target_link_libraries(paltest_feof_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt
index cd1fe52..e8a282f 100644
--- a/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_ferror_test1
 add_dependencies(paltest_ferror_test1 coreclrpal)
 
 target_link_libraries(paltest_ferror_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt
index 05bd7fd..deb3f1f 100644
--- a/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_ferror_test2
 add_dependencies(paltest_ferror_test2 coreclrpal)
 
 target_link_libraries(paltest_ferror_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt
index 58c7c5a..ef13ca4 100644
--- a/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fflush_test1
 add_dependencies(paltest_fflush_test1 coreclrpal)
 
 target_link_libraries(paltest_fflush_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt
index d327d68..40f9c65 100644
--- a/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fgets_test1
 add_dependencies(paltest_fgets_test1 coreclrpal)
 
 target_link_libraries(paltest_fgets_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt
index 23bcdef..a2d2563 100644
--- a/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fgets_test2
 add_dependencies(paltest_fgets_test2 coreclrpal)
 
 target_link_libraries(paltest_fgets_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt
index 0833ad0..37398b8 100644
--- a/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fgets_test3
 add_dependencies(paltest_fgets_test3 coreclrpal)
 
 target_link_libraries(paltest_fgets_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt
index 3222ed8..4324626 100644
--- a/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_floor_test1
 add_dependencies(paltest_floor_test1 coreclrpal)
 
 target_link_libraries(paltest_floor_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt
index f6e24ad..8834f4d 100644
--- a/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_floorf_test1
 add_dependencies(paltest_floorf_test1 coreclrpal)
 
 target_link_libraries(paltest_floorf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt
index 33fbfb2..22bcd3a 100644
--- a/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fmod_test1
 add_dependencies(paltest_fmod_test1 coreclrpal)
 
 target_link_libraries(paltest_fmod_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt
index 487b3ad..861f3d7 100644
--- a/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fmodf_test1
 add_dependencies(paltest_fmodf_test1 coreclrpal)
 
 target_link_libraries(paltest_fmodf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt
index 7603fc6..955979a 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fopen_test1
 add_dependencies(paltest_fopen_test1 coreclrpal)
 
 target_link_libraries(paltest_fopen_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt
index b856992..3738f86 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fopen_test2
 add_dependencies(paltest_fopen_test2 coreclrpal)
 
 target_link_libraries(paltest_fopen_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt
index 5b28caf..88df51d 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fopen_test3
 add_dependencies(paltest_fopen_test3 coreclrpal)
 
 target_link_libraries(paltest_fopen_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt
index db5779f..f31c5d1 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fopen_test4
 add_dependencies(paltest_fopen_test4 coreclrpal)
 
 target_link_libraries(paltest_fopen_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt
index 6341e4a..975351d 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fopen_test5
 add_dependencies(paltest_fopen_test5 coreclrpal)
 
 target_link_libraries(paltest_fopen_test5
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt
index 39cf915..1e23585 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fopen_test6
 add_dependencies(paltest_fopen_test6 coreclrpal)
 
 target_link_libraries(paltest_fopen_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt
index ee22e34..dd81aa9 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fopen_test7
 add_dependencies(paltest_fopen_test7 coreclrpal)
 
 target_link_libraries(paltest_fopen_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt
index 60ffd49..277cee4 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test1
 add_dependencies(paltest_fprintf_test1 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt
index 3fb57c2..7f9dd41 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test10
 add_dependencies(paltest_fprintf_test10 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt
index d325ce2..a5365b4 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test11
 add_dependencies(paltest_fprintf_test11 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt
index 8bd3970..4042521 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test12
 add_dependencies(paltest_fprintf_test12 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt
index 702058b..47ba3cb 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test13
 add_dependencies(paltest_fprintf_test13 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt
index b92ede7..dc3186c 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test14
 add_dependencies(paltest_fprintf_test14 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt
index 20f1e42..91718ee 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test15
 add_dependencies(paltest_fprintf_test15 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt
index 8d72421..26dc1f8 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test16
 add_dependencies(paltest_fprintf_test16 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt
index 82d1f84..9493f54 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test17
 add_dependencies(paltest_fprintf_test17 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt
index 1ca54e4..21a2e87 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test18
 add_dependencies(paltest_fprintf_test18 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt
index 2c66239..419d180 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test19
 add_dependencies(paltest_fprintf_test19 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt
index ae1d9dc..88bd04c 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test2
 add_dependencies(paltest_fprintf_test2 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp
index 1ed7f3f..1441827 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp
@@ -36,6 +36,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest("foo %5.2s", "bar", "foo    ba");
     DoStrTest("foo %-5s", "bar", "foo bar  ");
     DoStrTest("foo %05s", "bar", "foo 00bar");
+    DoStrTest("foo %s", NULL, "foo (null)");
+    DoStrTest("foo %hs", NULL, "foo (null)");
+    DoWStrTest("foo %ls", NULL, "foo (null)");
+    DoWStrTest("foo %ws", NULL, "foo (null)");
+    DoStrTest("foo %Ls", NULL, "foo (null)");
+    DoStrTest("foo %I64s", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;    
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt
index 4b10c4c..42d3977 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test3
 add_dependencies(paltest_fprintf_test3 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp
index 6185135..dd34c08 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp
@@ -35,6 +35,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest("foo %5.2S", convert("bar"), "foo    ba");
     DoWStrTest("foo %-5S", convert("bar"), "foo bar  ");
     DoWStrTest("foo %05S", convert("bar"), "foo 00bar");
+    DoWStrTest("foo %S", NULL, "foo (null)");
+    DoStrTest("foo %hS", NULL, "foo (null)");
+    DoWStrTest("foo %lS", NULL, "foo (null)");
+    DoWStrTest("foo %wS", NULL, "foo (null)");
+    DoWStrTest("foo %LS", NULL, "foo (null)");
+    DoWStrTest("foo %I64S", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt
index 292bdb6..7e6cc18 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test4
 add_dependencies(paltest_fprintf_test4 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp
index 51ec1f0..ef3108d 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp
@@ -75,7 +75,7 @@ int __cdecl main(int argc, char *argv[])
 /*
 **  Run only on 64 bit platforms
 */
-#if defined(BIT64) && defined(PLATFORM_UNIX)
+#if defined(BIT64)
 	Trace("Testing for 64 Bit Platforms \n");
 	DoTest("%p", NULL, "NULL", "0000000000000000", "0x0");
     DoTest("%p", ptr, "pointer to 0x123456", "0000000000123456", "0x123456");
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt
index 370ed33..6cea519 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test5
 add_dependencies(paltest_fprintf_test5 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test5
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt
index bd1cbda..9e3cf01 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test6
 add_dependencies(paltest_fprintf_test6 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt
index 38429e7..92dd50a 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test7
 add_dependencies(paltest_fprintf_test7 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt
index 990eca2..9aa9af8 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test8
 add_dependencies(paltest_fprintf_test8 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt
index 715d38a..6a7bb4d 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test9
 add_dependencies(paltest_fprintf_test9 coreclrpal)
 
 target_link_libraries(paltest_fprintf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt
index d0f1aca..1e0fbcb 100644
--- a/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fputs_test1
 add_dependencies(paltest_fputs_test1 coreclrpal)
 
 target_link_libraries(paltest_fputs_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt
index 9242ea1..074500b 100644
--- a/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fputs_test2
 add_dependencies(paltest_fputs_test2 coreclrpal)
 
 target_link_libraries(paltest_fputs_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt
index 1bd84b5..71204c0 100644
--- a/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fread_test1
 add_dependencies(paltest_fread_test1 coreclrpal)
 
 target_link_libraries(paltest_fread_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt
index 93e0394..1bae93e 100644
--- a/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fread_test2
 add_dependencies(paltest_fread_test2 coreclrpal)
 
 target_link_libraries(paltest_fread_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt
index 285608b..a678e2e 100644
--- a/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fread_test3
 add_dependencies(paltest_fread_test3 coreclrpal)
 
 target_link_libraries(paltest_fread_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt
index 92ee989..66c0b56 100644
--- a/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_free_test1
 add_dependencies(paltest_free_test1 coreclrpal)
 
 target_link_libraries(paltest_free_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt
index 59ee8b4..906a935 100644
--- a/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fseek_test1
 add_dependencies(paltest_fseek_test1 coreclrpal)
 
 target_link_libraries(paltest_fseek_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt
index a1f350d..e7900f6 100644
--- a/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_ftell_test1
 add_dependencies(paltest_ftell_test1 coreclrpal)
 
 target_link_libraries(paltest_ftell_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt
index 519860b..4c58356 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test1
 add_dependencies(paltest_fwprintf_test1 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt
index e604e03..994cd5e 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test10
 add_dependencies(paltest_fwprintf_test10 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt
index 18be522..a2bc585 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test11
 add_dependencies(paltest_fwprintf_test11 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt
index 6ea739b..33006f4 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test12
 add_dependencies(paltest_fwprintf_test12 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt
index 8505ccb..fef3d08 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test13
 add_dependencies(paltest_fwprintf_test13 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt
index 548e60f..6e37e4f 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test14
 add_dependencies(paltest_fwprintf_test14 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt
index c5b5346..5f1513d 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test15
 add_dependencies(paltest_fwprintf_test15 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt
index 51af0a0..f77b355 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test16
 add_dependencies(paltest_fwprintf_test16 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt
index 9ed8a39..5a4a58e 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test17
 add_dependencies(paltest_fwprintf_test17 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt
index 3e3ba4e..9839b9f 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test18
 add_dependencies(paltest_fwprintf_test18 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt
index fbb7370..e7ac859 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test19
 add_dependencies(paltest_fwprintf_test19 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt
index e65a396..e589a06 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test2
 add_dependencies(paltest_fwprintf_test2 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp
index ecd3c51..1e03147 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp
@@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest(convert("foo %5.2s"), convert("bar"), "foo    ba");
     DoWStrTest(convert("foo %-5s"), convert("bar"), "foo bar  ");
     DoWStrTest(convert("foo %05s"), convert("bar"), "foo 00bar");
+    DoWStrTest(convert("foo %s"), NULL, "foo (null)");
+    DoStrTest(convert("foo %hs"), NULL, "foo (null)");
+    DoWStrTest(convert("foo %ls"), NULL, "foo (null)");
+    DoWStrTest(convert("foo %ws"), NULL, "foo (null)");
+    DoWStrTest(convert("foo %Ls"), NULL, "foo (null)");
+    DoWStrTest(convert("foo %I64s"), NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;    
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt
index 53c4636..f583d40 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test3
 add_dependencies(paltest_fwprintf_test3 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp
index d718a19..ff24aa7 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp
@@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest(convert("foo %5.2S"),"bar", "foo    ba");
     DoStrTest(convert("foo %-5S"), "bar", "foo bar  ");
     DoStrTest(convert("foo %05S"), "bar", "foo 00bar");
+    DoStrTest(convert("foo %S"), NULL, "foo (null)");
+    DoStrTest(convert("foo %hS"), NULL, "foo (null)");
+    DoWStrTest(convert("foo %lS"), NULL, "foo (null)");
+    DoWStrTest(convert("foo %wS"), NULL, "foo (null)");
+    DoStrTest(convert("foo %LS"), NULL, "foo (null)");
+    DoStrTest(convert("foo %I64S"), NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt
index 9dbb462..1669384 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test4
 add_dependencies(paltest_fwprintf_test4 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp
index 96fb472..a894120 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp
@@ -32,7 +32,7 @@ int __cdecl main(int argc, char *argv[])
 /*
 **  Run only on 64 bit platforms
 */
-#if defined(BIT64) && defined(PLATFORM_UNIX)
+#if defined(BIT64)
 	Trace("Testing for 64 Bit Platforms \n");
 	DoPointerTest(convert("%p"), NULL, "NULL", "0000000000000000", "0x0");
     DoPointerTest(convert("%p"), ptr, "pointer to 0x123456", "0000000000123456", 
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt
index 4e72e3c..4611c7f 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test5
 add_dependencies(paltest_fwprintf_test5 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test5
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt
index d57f07f..f692baa 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test6
 add_dependencies(paltest_fwprintf_test6 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt
index 314ca35..18b6673 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test7
 add_dependencies(paltest_fwprintf_test7 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt
index e818df2..dfb8814 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test8
 add_dependencies(paltest_fwprintf_test8 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt
index 28b6b86..3e08677 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test9
 add_dependencies(paltest_fwprintf_test9 coreclrpal)
 
 target_link_libraries(paltest_fwprintf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt
index 5c8b744..084c1fc 100644
--- a/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_fwrite_test1
 add_dependencies(paltest_fwrite_test1 coreclrpal)
 
 target_link_libraries(paltest_fwrite_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt
index 68ecaa9..92f6f31 100644
--- a/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_getc_test1
 add_dependencies(paltest_getc_test1 coreclrpal)
 
 target_link_libraries(paltest_getc_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt
index 9c52c28..8cb87b1 100644
--- a/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_getenv_test1
 add_dependencies(paltest_getenv_test1 coreclrpal)
 
 target_link_libraries(paltest_getenv_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt
index 971a836..de8bc27 100644
--- a/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_getenv_test2
 add_dependencies(paltest_getenv_test2 coreclrpal)
 
 target_link_libraries(paltest_getenv_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt
index 620ccd1..48d3b11 100644
--- a/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_getenv_test3
 add_dependencies(paltest_getenv_test3 coreclrpal)
 
 target_link_libraries(paltest_getenv_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt
index af65f32..033f58d 100644
--- a/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isalnum_test1
 add_dependencies(paltest_isalnum_test1 coreclrpal)
 
 target_link_libraries(paltest_isalnum_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt
index 82f19ad..8033ae0 100644
--- a/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isalpha_test1
 add_dependencies(paltest_isalpha_test1 coreclrpal)
 
 target_link_libraries(paltest_isalpha_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt
index b96b7aa..8f74b2d 100644
--- a/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isdigit_test1
 add_dependencies(paltest_isdigit_test1 coreclrpal)
 
 target_link_libraries(paltest_isdigit_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt
index d071d4b..a02dc70 100644
--- a/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_islower_test1
 add_dependencies(paltest_islower_test1 coreclrpal)
 
 target_link_libraries(paltest_islower_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt
index 91410a0..6e47a8f 100644
--- a/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isprint_test1
 add_dependencies(paltest_isprint_test1 coreclrpal)
 
 target_link_libraries(paltest_isprint_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt
index 53ad942..bcecac1 100644
--- a/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isprint_test2
 add_dependencies(paltest_isprint_test2 coreclrpal)
 
 target_link_libraries(paltest_isprint_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt
index c3cc525..ee6c8f3 100644
--- a/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isspace_test1
 add_dependencies(paltest_isspace_test1 coreclrpal)
 
 target_link_libraries(paltest_isspace_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt
index e1cfa66..9674279 100644
--- a/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isupper_test1
 add_dependencies(paltest_isupper_test1 coreclrpal)
 
 target_link_libraries(paltest_isupper_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt
index 4074abb..723a26a 100644
--- a/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_iswdigit_test1
 add_dependencies(paltest_iswdigit_test1 coreclrpal)
 
 target_link_libraries(paltest_iswdigit_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt
index d21c232..50c6f74 100644
--- a/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_iswprint_test1
 add_dependencies(paltest_iswprint_test1 coreclrpal)
 
 target_link_libraries(paltest_iswprint_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt
index 1f9a54f..02f6acd 100644
--- a/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_iswspace_test1
 add_dependencies(paltest_iswspace_test1 coreclrpal)
 
 target_link_libraries(paltest_iswspace_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt
index 1da5fba..301bd14 100644
--- a/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_iswupper_test1
 add_dependencies(paltest_iswupper_test1 coreclrpal)
 
 target_link_libraries(paltest_iswupper_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt
index ae55976..6809f5a 100644
--- a/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_iswxdigit_test1
 add_dependencies(paltest_iswxdigit_test1 coreclrpal)
 
 target_link_libraries(paltest_iswxdigit_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt
index 4fd46c9..cfb0e91 100644
--- a/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_isxdigit_test1
 add_dependencies(paltest_isxdigit_test1 coreclrpal)
 
 target_link_libraries(paltest_isxdigit_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt
index 2ffb3cd..70d1b5e 100644
--- a/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_labs_test1
 add_dependencies(paltest_labs_test1 coreclrpal)
 
 target_link_libraries(paltest_labs_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt
index 3adc3cc..2885109 100644
--- a/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_llabs_test1
 add_dependencies(paltest_llabs_test1 coreclrpal)
 
 target_link_libraries(paltest_llabs_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt
index 698699f..55b4258 100644
--- a/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_localtime_test1
 add_dependencies(paltest_localtime_test1 coreclrpal)
 
 target_link_libraries(paltest_localtime_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt
index c8f991b..15a45ed 100644
--- a/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_log_test1
 add_dependencies(paltest_log_test1 coreclrpal)
 
 target_link_libraries(paltest_log_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt
index 31025fb..17c8730 100644
--- a/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_log10_test1
 add_dependencies(paltest_log10_test1 coreclrpal)
 
 target_link_libraries(paltest_log10_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt
index b2c0835..6f3358b 100644
--- a/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_log10f_test1
 add_dependencies(paltest_log10f_test1 coreclrpal)
 
 target_link_libraries(paltest_log10f_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt
index 550f572..2dcfdef 100644
--- a/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_logf_test1
 add_dependencies(paltest_logf_test1 coreclrpal)
 
 target_link_libraries(paltest_logf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt
index f475730..b08685d 100644
--- a/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_malloc_test1
 add_dependencies(paltest_malloc_test1 coreclrpal)
 
 target_link_libraries(paltest_malloc_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt
index 663e104..1b72ab8 100644
--- a/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_malloc_test2
 add_dependencies(paltest_malloc_test2 coreclrpal)
 
 target_link_libraries(paltest_malloc_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt
index 959fd2a..1f6fc08 100644
--- a/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_memchr_test1
 add_dependencies(paltest_memchr_test1 coreclrpal)
 
 target_link_libraries(paltest_memchr_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt
index 43d8fdd..24aa40a 100644
--- a/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_memcmp_test1
 add_dependencies(paltest_memcmp_test1 coreclrpal)
 
 target_link_libraries(paltest_memcmp_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt
index 14db0df..982433f 100644
--- a/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_memcpy_test1
 add_dependencies(paltest_memcpy_test1 coreclrpal)
 
 target_link_libraries(paltest_memcpy_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt
index db6f65e..9794085 100644
--- a/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_memmove_test1
 add_dependencies(paltest_memmove_test1 coreclrpal)
 
 target_link_libraries(paltest_memmove_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt
index bc3d625..3f3c561 100644
--- a/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_memset_test1
 add_dependencies(paltest_memset_test1 coreclrpal)
 
 target_link_libraries(paltest_memset_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt
index 3fe7bc7..303ce62 100644
--- a/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_modf_test1
 add_dependencies(paltest_modf_test1 coreclrpal)
 
 target_link_libraries(paltest_modf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt
index 10e5e99..b3831c8 100644
--- a/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_modff_test1
 add_dependencies(paltest_modff_test1 coreclrpal)
 
 target_link_libraries(paltest_modff_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt
index f94210d..339b7a3 100644
--- a/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_pow_test1
 add_dependencies(paltest_pow_test1 coreclrpal)
 
 target_link_libraries(paltest_pow_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt
index 8ea040f..2b8e2bc 100644
--- a/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_powf_test1
 add_dependencies(paltest_powf_test1 coreclrpal)
 
 target_link_libraries(paltest_powf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt
index 2dace14..0938d8f 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test1
 add_dependencies(paltest_printf_test1 coreclrpal)
 
 target_link_libraries(paltest_printf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt
index 75e30c8..f2a284b 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test10
 add_dependencies(paltest_printf_test10 coreclrpal)
 
 target_link_libraries(paltest_printf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt
index 4ee12dc..8eb44b5 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test11
 add_dependencies(paltest_printf_test11 coreclrpal)
 
 target_link_libraries(paltest_printf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt
index 3b2e39d..17c4a53 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test12
 add_dependencies(paltest_printf_test12 coreclrpal)
 
 target_link_libraries(paltest_printf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt
index b6af021..13b0f63 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test13
 add_dependencies(paltest_printf_test13 coreclrpal)
 
 target_link_libraries(paltest_printf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt
index 5a6cf8a..22fd9ab 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test14
 add_dependencies(paltest_printf_test14 coreclrpal)
 
 target_link_libraries(paltest_printf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt
index b1466a3..cc350a5 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test15
 add_dependencies(paltest_printf_test15 coreclrpal)
 
 target_link_libraries(paltest_printf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt
index c81da10..a61b5a0 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test16
 add_dependencies(paltest_printf_test16 coreclrpal)
 
 target_link_libraries(paltest_printf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt
index 9d40e54..f8c1754 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test17
 add_dependencies(paltest_printf_test17 coreclrpal)
 
 target_link_libraries(paltest_printf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt
index 6ab11f4..c83c096 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test18
 add_dependencies(paltest_printf_test18 coreclrpal)
 
 target_link_libraries(paltest_printf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt
index f022938..4d3fe5f 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test19
 add_dependencies(paltest_printf_test19 coreclrpal)
 
 target_link_libraries(paltest_printf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt
index e92b6b0..d45c772 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test2
 add_dependencies(paltest_printf_test2 coreclrpal)
 
 target_link_libraries(paltest_printf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp
index e766ef4..1c61b1d 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp
@@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest("foo %5.2s", "bar", "foo    ba");
     DoStrTest("foo %-5s", "bar", "foo bar  ");
     DoStrTest("foo %05s", "bar", "foo 00bar");
+    DoStrTest("foo %s", NULL, "foo (null)");
+    DoStrTest("foo %hs", NULL, "foo (null)");
+    DoWStrTest("foo %ls", NULL, "foo (null)");
+    DoWStrTest("foo %ws", NULL, "foo (null)");
+    DoStrTest("foo %Ls", NULL, "foo (null)");
+    DoStrTest("foo %I64s", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;    
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt
index fcfd779..b6d9ce2 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test3
 add_dependencies(paltest_printf_test3 coreclrpal)
 
 target_link_libraries(paltest_printf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp
index 5cc5309..79fe721 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp
@@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest("foo %5.2S", convert("bar"), "foo    ba");
     DoWStrTest("foo %-5S", convert("bar"), "foo bar  ");
     DoWStrTest("foo %05S", convert("bar"), "foo 00bar");
+    DoWStrTest("foo %S", NULL, "foo (null)");
+    DoStrTest("foo %hS", NULL, "foo (null)");
+    DoWStrTest("foo %lS", NULL, "foo (null)");
+    DoWStrTest("foo %wS", NULL, "foo (null)");
+    DoWStrTest("foo %LS", NULL, "foo (null)");
+    DoWStrTest("foo %I64S", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt
index 7311bbe..621c103 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test4
 add_dependencies(paltest_printf_test4 coreclrpal)
 
 target_link_libraries(paltest_printf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp
index bcdc201..7b0178c 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp
@@ -29,7 +29,7 @@ int __cdecl main(int argc, char *argv[])
 /*
 **  Run only on 64 bit platforms
 */
-#if defined(BIT64) && defined(PLATFORM_UNIX)
+#if defined(BIT64)
 	Trace("Testing for 64 Bit Platforms \n");
 	DoPointerTest("%p", NULL, "NULL", "0000000000000000");
     DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456");
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt
index bfe185c..73e8b7d 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test5
 add_dependencies(paltest_printf_test5 coreclrpal)
 
 target_link_libraries(paltest_printf_test5
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt
index 842ebfe..07639c6 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test6
 add_dependencies(paltest_printf_test6 coreclrpal)
 
 target_link_libraries(paltest_printf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt
index 16e3919..72bc285 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test7
 add_dependencies(paltest_printf_test7 coreclrpal)
 
 target_link_libraries(paltest_printf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt
index 4a40fee..78ce601 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test8
 add_dependencies(paltest_printf_test8 coreclrpal)
 
 target_link_libraries(paltest_printf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt
index df8f75d..dfc2a83 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_printf_test9
 add_dependencies(paltest_printf_test9 coreclrpal)
 
 target_link_libraries(paltest_printf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt
index ff215b8..f41f409 100644
--- a/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_qsort_test1
 add_dependencies(paltest_qsort_test1 coreclrpal)
 
 target_link_libraries(paltest_qsort_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt
index cdd9642..16e5c44 100644
--- a/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_qsort_test2
 add_dependencies(paltest_qsort_test2 coreclrpal)
 
 target_link_libraries(paltest_qsort_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt
index 6728f40..0afb650 100644
--- a/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_rand_srand_test1
 add_dependencies(paltest_rand_srand_test1 coreclrpal)
 
 target_link_libraries(paltest_rand_srand_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt
index 62830a0..0c263d5 100644
--- a/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_realloc_test1
 add_dependencies(paltest_realloc_test1 coreclrpal)
 
 target_link_libraries(paltest_realloc_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt
index 74a0e78..c46aaec 100644
--- a/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sin_test1
 add_dependencies(paltest_sin_test1 coreclrpal)
 
 target_link_libraries(paltest_sin_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt
index 0651b43..9e03130 100644
--- a/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sinf_test1
 add_dependencies(paltest_sinf_test1 coreclrpal)
 
 target_link_libraries(paltest_sinf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt
index b0101ba..1c99bfa 100644
--- a/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sinh_test1
 add_dependencies(paltest_sinh_test1 coreclrpal)
 
 target_link_libraries(paltest_sinh_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt
index 72cce43..60208d4 100644
--- a/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sinhf_test1
 add_dependencies(paltest_sinhf_test1 coreclrpal)
 
 target_link_libraries(paltest_sinhf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt
index ee0d90f..5de43c7 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test1
 add_dependencies(paltest_sprintf_test1 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt
index 1efad19..54bc9c0 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test10
 add_dependencies(paltest_sprintf_test10 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt
index f2f4da6..6eac956 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test11
 add_dependencies(paltest_sprintf_test11 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt
index 361e91f..a499759 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test12
 add_dependencies(paltest_sprintf_test12 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt
index d08e13b..4d66713 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test13
 add_dependencies(paltest_sprintf_test13 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt
index 60ac292..ce41b8a 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test14
 add_dependencies(paltest_sprintf_test14 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt
index 57bba40..d20c4d0 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test15
 add_dependencies(paltest_sprintf_test15 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt
index fc93e1a..2ca1ffd 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test16
 add_dependencies(paltest_sprintf_test16 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt
index dc5ff2b..0c17cbf 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test17
 add_dependencies(paltest_sprintf_test17 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt
index f6e1b09..afc3e8f 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test18
 add_dependencies(paltest_sprintf_test18 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test18
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt
index 757288b..7553aed 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test19
 add_dependencies(paltest_sprintf_test19 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test19
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt
index d569263..a4b0b00 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test2
 add_dependencies(paltest_sprintf_test2 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp
index 990f4f0..a3eb71d 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp
@@ -40,6 +40,12 @@ int __cdecl main(int argc, char *argv[])
     DoStrTest("foo %5.2s", "bar", "foo    ba");
     DoStrTest("foo %-5s", "bar", "foo bar  ");
     DoStrTest("foo %05s", "bar", "foo 00bar");
+    DoStrTest("foo %s", NULL, "foo (null)");
+    DoStrTest("foo %hs", NULL, "foo (null)");
+    DoWStrTest("foo %ls", NULL, "foo (null)");
+    DoWStrTest("foo %ws", NULL, "foo (null)");
+    DoStrTest("foo %Ls", NULL, "foo (null)");
+    DoStrTest("foo %I64s", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;    
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt
index 518c3f8..825c79c 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test3
 add_dependencies(paltest_sprintf_test3 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp
index c0dc8e1..dd6e590 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp
@@ -39,6 +39,12 @@ int __cdecl main(int argc, char *argv[])
     DoWStrTest("foo %5.2S", convert("bar"), "foo    ba");
     DoWStrTest("foo %-5S", convert("bar"), "foo bar  ");
     DoWStrTest("foo %05S", convert("bar"), "foo 00bar");
+    DoWStrTest("foo %S", NULL, "foo (null)");
+    DoStrTest("foo %hS", NULL, "foo (null)");
+    DoWStrTest("foo %lS", NULL, "foo (null)");
+    DoWStrTest("foo %wS", NULL, "foo (null)");
+    DoWStrTest("foo %LS", NULL, "foo (null)");
+    DoWStrTest("foo %I64S", NULL, "foo (null)");
 
     PAL_Terminate();
     return PASS;
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt
index 260def4..0bde37c 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test4
 add_dependencies(paltest_sprintf_test4 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp
index 46115ad..bb3a6d8 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp
@@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[])
 /*
 **  Run only on 64 bit platforms
 */
-#if defined(BIT64) && defined(PLATFORM_UNIX)
+#if defined(BIT64)
 	Trace("Testing for 64 Bit Platforms \n");
     DoPointerTest("%p", NULL, "NULL", "0000000000000000");
     DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456");
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt
index fce1f20..495c256 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test6
 add_dependencies(paltest_sprintf_test6 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt
index 72a831e..2fabe0b 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test7
 add_dependencies(paltest_sprintf_test7 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt
index c9522c1..cb67e89 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test8
 add_dependencies(paltest_sprintf_test8 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test8
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt
index e76fed4..005a23d 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test9
 add_dependencies(paltest_sprintf_test9 coreclrpal)
 
 target_link_libraries(paltest_sprintf_test9
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt
index d4aefe6..4680e23 100644
--- a/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sqrt_test1
 add_dependencies(paltest_sqrt_test1 coreclrpal)
 
 target_link_libraries(paltest_sqrt_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt
index 96b6ffa..51b76ae 100644
--- a/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sqrtf_test1
 add_dependencies(paltest_sqrtf_test1 coreclrpal)
 
 target_link_libraries(paltest_sqrtf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt
index 97b8f57..82a0e70 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test1
 add_dependencies(paltest_sscanf_test1 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test1
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt
index afda216..c85e1b0 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test10
 add_dependencies(paltest_sscanf_test10 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test10
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt
index c8f98ae..2c7f0e2 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test11
 add_dependencies(paltest_sscanf_test11 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test11
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt
index 0ecedc3..af23556 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test12
 add_dependencies(paltest_sscanf_test12 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test12
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt
index 4566ec3..7f9b3a1 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test13
 add_dependencies(paltest_sscanf_test13 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test13
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt
index 557acf5..c195b12 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test14
 add_dependencies(paltest_sscanf_test14 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test14
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt
index efde5c4..0c8967d 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test15
 add_dependencies(paltest_sscanf_test15 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test15
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt
index 6757b0d..10a6cc8 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test16
 add_dependencies(paltest_sscanf_test16 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test16
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt
index 8ea4d5e..84832a8 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test17
 add_dependencies(paltest_sscanf_test17 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test17
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt
index 4e36223..a79492b 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test2
 add_dependencies(paltest_sscanf_test2 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test2
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt
index 053a96c..ba1a528 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test3
 add_dependencies(paltest_sscanf_test3 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test3
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt
index ae04bfe..456fce0 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test4
 add_dependencies(paltest_sscanf_test4 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test4
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt
index 33dcaff..b407503 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test5
 add_dependencies(paltest_sscanf_test5 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test5
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt
index 1dd23c3..f981512 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test6
 add_dependencies(paltest_sscanf_test6 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test6
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt
index 015a27b..ba29136 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt
@@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test7
 add_dependencies(paltest_sscanf_test7 coreclrpal)
 
 target_link_libraries(paltest_sscanf_test7
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt
index aa41ab4..2437679 100644
--- a/