diff --git a/deps/c-testrunnerswitcher b/deps/c-testrunnerswitcher
index 095648ce..48b0066e 160000
--- a/deps/c-testrunnerswitcher
+++ b/deps/c-testrunnerswitcher
@@ -1 +1 @@
-Subproject commit 095648cece8d0a20ba24032145924da21dc7f473
+Subproject commit 48b0066eef2dd726ba0ea48189923060aacfb449
diff --git a/deps/ctest b/deps/ctest
index e021764c..4b886570 160000
--- a/deps/ctest
+++ b/deps/ctest
@@ -1 +1 @@
-Subproject commit e021764c05e8d863d0ddf432ac0d1ccd03671bea
+Subproject commit 4b886570c53fbca2609e416b42a0e8aedec17ae3
diff --git a/tests/azure_base64_ut/azure_base64_ut.c b/tests/azure_base64_ut/azure_base64_ut.c
index d7ac1806..5ec640c3 100644
--- a/tests/azure_base64_ut/azure_base64_ut.c
+++ b/tests/azure_base64_ut/azure_base64_ut.c
@@ -1744,86 +1744,23 @@ TEST_FUNCTION(Azure_Base64_Decode_zero_length_returns_zero_length)
 }
 
 /*Tests_SRS_BASE64_06_011: [If the source string has an invalid length for a base 64 encoded string then Azure_Base64_Decode shall return NULL.]*/
-TEST_FUNCTION(Azure_Base64_Decode_invalid_length_fails_1)
+PARAMETERIZED_TEST_FUNCTION(Azure_Base64_Decode_invalid_length_fails,
+    ARGS(const char*, invalid_input),
+    CASE(("1"), length_1),
+    CASE(("12"), length_2),
+    CASE(("123"), length_3),
+    CASE(("12345"), length_5),
+    CASE(("123456"), length_6),
+    CASE(("1234567"), length_7))
 {
     ///Arrange
     BUFFER_HANDLE result;
 
     ///act
-    result = Azure_Base64_Decode("1");
+    result = Azure_Base64_Decode(invalid_input);
 
     ///assert
     ASSERT_IS_NULL(result);
-
-}
-
-/*Tests_SRS_BASE64_06_011: [If the source string has an invalid length for a base 64 encoded string then Azure_Base64_Decode shall return NULL.]*/
-TEST_FUNCTION(Azure_Base64_Decode_invalid_length_fails_2)
-{
-    ///Arrange
-    BUFFER_HANDLE result;
-
-    ///act
-    result = Azure_Base64_Decode("12");
-
-    ///assert
-    ASSERT_IS_NULL(result);
-
-}
-
-/*Tests_SRS_BASE64_06_011: [If the source string has an invalid length for a base 64 encoded string then Azure_Base64_Decode shall return NULL.]*/
-TEST_FUNCTION(Azure_Base64_Decode_invalid_length_fails_3)
-{
-    ///Arrange
-    BUFFER_HANDLE result;
-
-    ///act
-    result = Azure_Base64_Decode("123");
-
-    ///assert
-    ASSERT_IS_NULL(result);
-
-}
-
-/*Tests_SRS_BASE64_06_011: [If the source string has an invalid length for a base 64 encoded string then Azure_Base64_Decode shall return NULL.]*/
-TEST_FUNCTION(Azure_Base64_Decode_invalid_length_fails_4)
-{
-    ///Arrange
-    BUFFER_HANDLE result;
-
-    ///act
-    result = Azure_Base64_Decode("12345");
-
-    ///assert
-    ASSERT_IS_NULL(result);
-
-}
-
-/*Tests_SRS_BASE64_06_011: [If the source string has an invalid length for a base 64 encoded string then Azure_Base64_Decode shall return NULL.]*/
-TEST_FUNCTION(Azure_Base64_Decode_invalid_length_fails_5)
-{
-    ///Arrange
-    BUFFER_HANDLE result;
-
-    ///act
-    result = Azure_Base64_Decode("123456");
-
-    ///assert
-    ASSERT_IS_NULL(result);
-}
-
-/*Tests_SRS_BASE64_06_011: [If the source string has an invalid length for a base 64 encoded string then Azure_Base64_Decode shall return NULL.]*/
-TEST_FUNCTION(Azure_Base64_Decode_invalid_length_fails_6)
-{
-    ///Arrange
-    BUFFER_HANDLE result;
-
-    ///act
-    result = Azure_Base64_Decode("1234567");
-
-    ///assert
-    ASSERT_IS_NULL(result);
-
 }
 
 /*Tests_SRS_BASE64_06_010: [If there is any memory allocation failure during the decode then Azure_Base64_Decode shall return NULL.]*/
diff --git a/tests/flags_to_string_int/flags_to_string_int.c b/tests/flags_to_string_int/flags_to_string_int.c
index d5a3781d..2844faa0 100644
--- a/tests/flags_to_string_int/flags_to_string_int.c
+++ b/tests/flags_to_string_int/flags_to_string_int.c
@@ -31,106 +31,24 @@ TEST_FUNCTION_CLEANUP(cleans)
 {
 }
 
-TEST_FUNCTION(collection_one_flag_one)
+PARAMETERIZED_TEST_FUNCTION(collection_one_flags_to_string,
+    ARGS(uint32_t, flags_value, const char*, expected_string),
+    CASE((1, "FLAG_ONE"), flag_one),
+    CASE((2, "FLAG_TWO"), flag_two),
+    CASE((3, "FLAG_ONE | FLAG_TWO"), flag_one_and_two),
+    CASE((0, ""), zero),
+    CASE((4, "UNKNOWN_FLAG(0x00000004)"), unknown_flag),
+    CASE((13, "FLAG_ONE | UNKNOWN_FLAG(0x0000000c)"), known_and_unknown_flag),
+    CASE((15, "FLAG_ONE | FLAG_TWO | UNKNOWN_FLAG(0x0000000c)"), all_known_and_unknown_flag))
 {
     ///arrange
 
     ///act
-    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(1);
-    
-    ///assert
-    ASSERT_IS_NOT_NULL(result);
-    ASSERT_ARE_EQUAL(char_ptr, "FLAG_ONE", result);
-
-    ///clean
-    free(result);
-}
-
-TEST_FUNCTION(collection_one_flag_two)
-{
-    ///arrange
-
-    ///act
-    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(2);
-
-    ///assert
-    ASSERT_IS_NOT_NULL(result);
-    ASSERT_ARE_EQUAL(char_ptr, "FLAG_TWO", result);
-
-    ///clean
-    free(result);
-}
-
-TEST_FUNCTION(collection_one_flag_one_and_two)
-{
-    ///arrange
-
-    ///act
-    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(1 | 2);
-
-    ///assert
-    ASSERT_IS_NOT_NULL(result);
-    ASSERT_ARE_EQUAL(char_ptr, "FLAG_ONE | FLAG_TWO", result);
-
-    ///clean
-    free(result);
-}
-
-TEST_FUNCTION(collection_one_zero)
-{
-    ///arrange
-
-    ///act
-    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(0);
-
-    ///assert
-    ASSERT_IS_NOT_NULL(result);
-    ASSERT_ARE_EQUAL(char_ptr, "", result);
-
-    ///clean
-    free(result);
-}
-
-TEST_FUNCTION(collection_one_unknown_flag)
-{
-    ///arrange
-
-    ///act
-    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(4);
-
-    ///assert
-    ASSERT_IS_NOT_NULL(result);
-    ASSERT_ARE_EQUAL(char_ptr, "UNKNOWN_FLAG(0x00000004)", result);
-
-    ///clean
-    free(result);
-}
-
-TEST_FUNCTION(collection_one_known_and_unknown_flag)
-{
-    ///arrange
-
-    ///act
-    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(13);
-
-    ///assert
-    ASSERT_IS_NOT_NULL(result);
-    ASSERT_ARE_EQUAL(char_ptr, "FLAG_ONE | UNKNOWN_FLAG(0x0000000c)", result);
-
-    ///clean
-    free(result);
-}
-
-TEST_FUNCTION(collection_one_all_known_and_unknown_flag)
-{
-    ///arrange
-
-    ///act
-    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(15);
+    char* result = FLAGS_TO_STRING(COLLECTION_ONE)(flags_value);
 
     ///assert
     ASSERT_IS_NOT_NULL(result);
-    ASSERT_ARE_EQUAL(char_ptr, "FLAG_ONE | FLAG_TWO | UNKNOWN_FLAG(0x0000000c)", result);
+    ASSERT_ARE_EQUAL(char_ptr, expected_string, result);
 
     ///clean
     free(result);