diff --git a/upptst/ConvertOverflow/ConvertOverflow.cpp b/upptst/ConvertOverflow/ConvertOverflow.cpp
index 5a7656a52..4b3ce60de 100644
--- a/upptst/ConvertOverflow/ConvertOverflow.cpp
+++ b/upptst/ConvertOverflow/ConvertOverflow.cpp
@@ -2,7 +2,7 @@
 
 using namespace Upp;
 
-#define CHECK_OVERFLOW(s, cls, overflow) { cls x; Value v = x.Scan(s); LOG(s << " -> " << v); }
+#define CHECK_OVERFLOW(s, cls, overflow) { cls x; Value v = x.Scan(s); LOG(s << " -> " << v); ASSERT(v.IsError() == overflow); }
 
 CONSOLE_APP_MAIN
 {
@@ -11,6 +11,6 @@ CONSOLE_APP_MAIN
 	CHECK_OVERFLOW("2147483647", ConvertInt, false);
 	CHECK_OVERFLOW("2147483648", ConvertInt, true);
 
-	CHECK_OVERFLOW("-2147483648", ConvertInt, false);
-	CHECK_OVERFLOW("-2147483649", ConvertInt, true);
+	CHECK_OVERFLOW("-2147483647", ConvertInt, false);
+	CHECK_OVERFLOW("-2147483648", ConvertInt, true);
 }
diff --git a/upptst/NaNINF/NaNInf.cpp b/upptst/NaNINF/NaNInf.cpp
index e72dfd863..176be400c 100644
--- a/upptst/NaNINF/NaNInf.cpp
+++ b/upptst/NaNINF/NaNInf.cpp
@@ -4,22 +4,28 @@ using namespace Upp;
 
 CONSOLE_APP_MAIN
 {
+	StdLogSetup(LOG_COUT|LOG_FILE);
 	double d = 0;
 	ASSERT(!IsNaN(d));
 	ASSERT(!IsInf(d));
 	ASSERT(IsFin(d));
 	
-	d = sqrt(-1.0);
+	d = sqrt(StrDbl("-1.0"));
 	ASSERT(IsNaN(d));
 	ASSERT(!IsInf(d));
+	ASSERT(!IsFin(d));
 
 	d = 1e300;
 	d *= d;
 	ASSERT(!IsNaN(d));
 	ASSERT(IsInf(d));
+	ASSERT(!IsFin(d));
 
 	d = 1e300;
 	d *= -d;
 	ASSERT(!IsNaN(d));
 	ASSERT(IsInf(d));
+	ASSERT(!IsFin(d));
+	
+	LOG("Everything OK");
 }
diff --git a/upptst/NaNINF/init b/upptst/NaNINF/init
index 692eb3b80..9d9727187 100644
--- a/upptst/NaNINF/init
+++ b/upptst/NaNINF/init
@@ -1,4 +1,4 @@
-#ifndef _NaNInf_icpp_init_stub
-#define _NaNInf_icpp_init_stub
+#ifndef _NaNINF_icpp_init_stub
+#define _NaNINF_icpp_init_stub
 #include "Core/init"
 #endif