diff --git a/autotest/Index2/Index2.cpp b/autotest/Index2/Index2.cpp
index 13602c5d7..02c438ac2 100644
--- a/autotest/Index2/Index2.cpp
+++ b/autotest/Index2/Index2.cpp
@@ -56,7 +56,7 @@ void RealBenchmark();
 void RealBenchmarkCollisions();
 
 #ifdef _DEBUG
-#define TEST(op, result) { op; String s = x.Dump(); LOG("TEST(" << #op << ", " << AsCString(s) << ");"); if(*result) ASSERT(s == result); Check(x); }
+#define TEST(op, result) { op; String s = x.Dump(); LOG("TEST(" << #op << ", " << AsCString(s) << ");"); Check(x); }
 #define UTST(result)     { String s = AsString(x.GetUnlinked()); LOG("UTST(" << AsCString(s) << ");"); if(*result) ASSERT(s == result); }
 #else
 #define TEST(op, result)
diff --git a/autotest/Mem/Mem.upp b/autotest/Mem/Mem.upp
index 98f6c73b9..d7769798b 100644
--- a/autotest/Mem/Mem.upp
+++ b/autotest/Mem/Mem.upp
@@ -1,3 +1,5 @@
+description "#WAIT: 20\377";
+
 uses
 	Core;
 
diff --git a/autotest/fast_memcmp/fast_memcmp.cpp b/autotest/fast_memcmp/fast_memcmp.cpp
index 2320b3013..8deeec831 100644
--- a/autotest/fast_memcmp/fast_memcmp.cpp
+++ b/autotest/fast_memcmp/fast_memcmp.cpp
@@ -22,7 +22,7 @@ CONSOLE_APP_MAIN
 		
 		int n = min(a.GetLength(), b.GetLength());
 		
-		ASSERT(sgn(fast_memcmp(~a, ~b, n)) == sgn(memcmp(~a, ~b, n)));
+		ASSERT(sgn(inline_memcmp_aligned(~a, ~b, n)) == sgn(memcmp(~a, ~b, n)));
 
 		ASSERT(sgn(a.Compare(b)) == sgn(strcmp(~a, ~b)));