diff --git a/test/cram/asserts.t b/test/cram/asserts.t
index 3ff3448..fb53385 100644
--- a/test/cram/asserts.t
+++ b/test/cram/asserts.t
@@ -12,12 +12,12 @@ Test C assertions:
 Test C++ assertions:
 
   $ asserts.cc.bin
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m105\x1b[0m: Assertion failed: The expression (&s1)[0 .. 2] == (&s2)[0 .. 2] is false. (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m108\x1b[0m: Assertion failed: The expression (&s1)[0..Size] == (&s2)[0..Size] is false. (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] asserts::array: \(\d\.\d\ds\) \(esc\) (re)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m14\x1b[0m: Assertion failed: assert is fatal, expect isn't (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m15\x1b[0m: Assertion failed: This assert runs (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] asserts::base: \(\d\.\d\ds\) \(esc\) (re)
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m110\x1b[0m: Assertion failed: The statement `throw std::exception()` did not throw an instance of the `std::bad_alloc` exception. (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m113\x1b[0m: Assertion failed: The statement `throw std::exception()` did not throw an instance of the `std::bad_alloc` exception. (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] asserts::exception: \(\d\.\d\ds\) \(esc\) (re)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m20\x1b[0m: Assertion failed: You can fail an assertion with a message from anywhere (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m21\x1b[0m: Assertion failed: The conditions for this assertion were not met. (esc)
@@ -43,7 +43,7 @@ Testing all assert messages
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m13\x1b[0m: Assertion failed: The expression (1) > (2) is false. (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m14\x1b[0m: Assertion failed: The expression (1) >= (2) is false. (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m15\x1b[0m: Assertion failed: "" is not null. (esc)
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m16\x1b[0m: Assertion failed: ((void *)0) is null. (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m16\x1b[0m: Assertion failed: ((void *) 0) is null. (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m18\x1b[0m: Assertion failed: The expression (2) - (1) <= (0.1) && (1) - (2) <= (0.1) is false. (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m19\x1b[0m: Assertion failed: The expression (2) - (2) > (0.1) || (2) - (2) > (0.1) is false. (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mfailmessages.c\x1b[0m:\x1b[0;31m21\x1b[0m: Assertion failed: "foo" (`foo`) is not empty. (esc)
diff --git a/test/cram/parameterized.t b/test/cram/parameterized.t
index a5a6bd2..a373306 100644
--- a/test/cram/parameterized.t
+++ b/test/cram/parameterized.t
@@ -1,11 +1,11 @@
 Using parameterized tests
 
   $ parameterized.c.bin
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m74\x1b[0m: Assertion failed: Parameters: (1, 2.000000) (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m78\x1b[0m: Assertion failed: Parameters: (1, 2.000000) (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] params::cleanup: \(\d\.\d\ds\) \(esc\) (re)
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m74\x1b[0m: Assertion failed: Parameters: (3, 4.000000) (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m78\x1b[0m: Assertion failed: Parameters: (3, 4.000000) (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] params::cleanup: \(\d\.\d\ds\) \(esc\) (re)
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m74\x1b[0m: Assertion failed: Parameters: (5, 6.000000) (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m78\x1b[0m: Assertion failed: Parameters: (5, 6.000000) (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] params::cleanup: \(\d\.\d\ds\) \(esc\) (re)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m34\x1b[0m: Assertion failed: Parameters: (1, 2.000000) (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] params::multiple: \(\d\.\d\ds\) \(esc\) (re)
@@ -48,13 +48,13 @@ Using parameterized tests (verbose)
   [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc)
   [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m3\x1b[0m tests from \x1b[0;33mparams\x1b[0m: (esc)
   [\x1b[0;34mRUN \x1b[0m] params::cleanup (esc)
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m74\x1b[0m: Assertion failed: Parameters: (1, 2.000000) (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m78\x1b[0m: Assertion failed: Parameters: (1, 2.000000) (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] params::cleanup: \(\d\.\d\ds\) \(esc\) (re)
   [\x1b[0;34mRUN \x1b[0m] params::cleanup (esc)
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m74\x1b[0m: Assertion failed: Parameters: (3, 4.000000) (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m78\x1b[0m: Assertion failed: Parameters: (3, 4.000000) (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] params::cleanup: \(\d\.\d\ds\) \(esc\) (re)
   [\x1b[0;34mRUN \x1b[0m] params::cleanup (esc)
-  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m74\x1b[0m: Assertion failed: Parameters: (5, 6.000000) (esc)
+  [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m78\x1b[0m: Assertion failed: Parameters: (5, 6.000000) (esc)
   \[\\x1b\[0;31mFAIL\\x1b\[0m\] params::cleanup: \(\d\.\d\ds\) \(esc\) (re)
   [\x1b[0;34mRUN \x1b[0m] params::multiple (esc)
   [\x1b[0;34m----\x1b[0m] \x1b[0;1mparameterized.c\x1b[0m:\x1b[0;31m34\x1b[0m: Assertion failed: Parameters: (1, 2.000000) (esc)