diff --git a/ChangeLog b/ChangeLog
index 8d52e2a1..b078837b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,11 @@
 Changes in 3.9
 	- Add long double support to vsnprintf_s. GH #103
 	  With fixes for %a, %g, %G, %#g.
+	- Added *printf_s configure flags --disable-float, --disable-float-exp,
+          --disable-long-long, --disable-long-double, --disable-printf-ptrdiff
 	- Fixed %lc, %ls bug in vsnprintf_s.
+	- Fixed 5 wrong case-mappings with Unicode 15: GH #145.
+	  2 GEORGIAN, 3 VITHKUQI characters.
 	- Fixes for non-POSIX systems missing fileno and ftruncate. GH #136
 	  (ecospro compiler)
 
diff --git a/tests/test_getenv_s.c b/tests/test_getenv_s.c
index 9e6c2f56..50f272c2 100644
--- a/tests/test_getenv_s.c
+++ b/tests/test_getenv_s.c
@@ -51,6 +51,7 @@ int test_getenv_s(void) {
         INDCMP(!= 0);
     }
 
+    EXPECT_BOS("empty name")
     rc = getenv_s(&len, NULL, 0, NULL);
     ERR_MSVC(ESNULLP, EINVAL);
     ind = len;
@@ -76,7 +77,7 @@ int test_getenv_s(void) {
     /*--------------------------------------------------*/
 
 #ifndef HAVE_CT_BOS_OVR
-    EXPECT_BOS("dest overflow")
+    EXPECT_BOS("dest overflow or empty")
     rc = getenv_s(&len, dest, RSIZE_MAX_STR + 1, name);
     ERR_MSVC(ESLEMAX, 0);
     ind = len;
diff --git a/tests/test_memchr_s.c b/tests/test_memchr_s.c
index 3379a961..802c9478 100644
--- a/tests/test_memchr_s.c
+++ b/tests/test_memchr_s.c
@@ -34,7 +34,7 @@ int test_memchr_s(void) {
     ERR(ESNULLP);
     SUBNULL();
 
-    EXPECT_BOS("empty result")
+    EXPECT_BOS("empty resultp")
     rc = memchr_s(mem, LEN, ch, NULL);
     ERR(ESNULLP);
 
diff --git a/tests/test_memrchr_s.c b/tests/test_memrchr_s.c
index b5e72e12..38faa81f 100644
--- a/tests/test_memrchr_s.c
+++ b/tests/test_memrchr_s.c
@@ -39,7 +39,7 @@ int test_memrchr_s(void) {
     ERR(ESNULLP);
     SUBNULL();
 
-    EXPECT_BOS("empty result")
+    EXPECT_BOS("empty resultp")
     rc = memrchr_s(mem, LEN, ch, NULL);
     ERR(ESNULLP);
 
diff --git a/tests/test_sscanf_s.c b/tests/test_sscanf_s.c
index ff833f18..6b552de8 100644
--- a/tests/test_sscanf_s.c
+++ b/tests/test_sscanf_s.c
@@ -37,8 +37,8 @@ int test_sscanf_s(void) {
 
     print_msvcrt(use_msvcrt);
 #ifndef HAVE_CT_BOS_OVR
-    EXPECT_BOS("empty fmt")
     GCC_DIAG_IGNORE(-Wformat-extra-args)
+    EXPECT_BOS("empty fmt")
     rc = sscanf_s(str1, NULL, NULL);
     GCC_DIAG_RESTORE
     init_msvcrt(errno == ESNULLP, &use_msvcrt);
diff --git a/tests/test_strisalphanumeric_s.c b/tests/test_strisalphanumeric_s.c
index 7ca97e34..bbc12518 100644
--- a/tests/test_strisalphanumeric_s.c
+++ b/tests/test_strisalphanumeric_s.c
@@ -37,7 +37,7 @@ int main(void) {
     rc = strisalphanumeric_s(str, LEN + 1);
     ERR(false)
 
-    EXPECT_BOS_TODO("dest overflow")
+    EXPECT_BOS("dest overflow")
     rc = strisalphanumeric_s("", 2);
     ERR(false)
 #endif
diff --git a/tests/test_strisascii_s.c b/tests/test_strisascii_s.c
index fa4e9eb1..4c86aa33 100644
--- a/tests/test_strisascii_s.c
+++ b/tests/test_strisascii_s.c
@@ -41,11 +41,11 @@ int main(void) {
     ERR(false)
 
     /* literal strings once fixed via const decl. fragile */
-    EXPECT_BOS_TODO("dest overflow")
+    EXPECT_BOS("dest overflow")
     rc = strisascii_s("test", RSIZE_MAX_STR + 1);
     ERR(false)
 
-    EXPECT_BOS_TODO("dest overflow")
+    EXPECT_BOS("dest overflow")
     rc = strisascii_s("", 2);
     ERR(false)
 #endif
diff --git a/tests/test_strncat_s.c b/tests/test_strncat_s.c
index bb36884d..f81461e5 100644
--- a/tests/test_strncat_s.c
+++ b/tests/test_strncat_s.c
@@ -159,7 +159,7 @@ int test_strncat_s(void) {
     /*--------------------------------------------------*/
 
     strcpy(str1, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-    EXPECT_BOS("slen exceeds src")
+    EXPECT_BOS("slen exceeds src") EXPECT_BOS("src overflow or empty")
     rc = strncat_s(str1, 32, "ROString", 31);
     ERR_MSVC(EOVERFLOW, EINVAL);
     if (!use_msvcrt) {
diff --git a/tests/test_strncpy_s.c b/tests/test_strncpy_s.c
index 534d9c5f..0a4e707f 100644
--- a/tests/test_strncpy_s.c
+++ b/tests/test_strncpy_s.c
@@ -154,7 +154,7 @@ int test_strncpy_s(void) {
 
     // dont clear the const string, but dest.
     strcpy(str1, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-    EXPECT_BOS("slen exceeds src")
+    EXPECT_BOS("slen exceeds src") EXPECT_BOS("src overflow or empty")
     rc = strncpy_s(str1, 32, "ROString", 31);
     ERR(EOVERFLOW); /* slen exceeds src */
     if (!use_msvcrt) {
diff --git a/tests/test_strpbrk_s.c b/tests/test_strpbrk_s.c
index 0afc93b5..112851d9 100644
--- a/tests/test_strpbrk_s.c
+++ b/tests/test_strpbrk_s.c
@@ -62,7 +62,7 @@ int test_strpbrk_s(void) {
     ERR(EOVERFLOW)
     NOFIRST()
 
-    EXPECT_BOS("slen exceeds src")
+    EXPECT_BOS("slen exceeds src") EXPECT_BOS("src overflow or empty")
     rc = strpbrk_s(str1, LEN, str2, LEN + 1, &first);
     ERR(EOVERFLOW)
     NOFIRST()