diff --git a/src/test.cpp b/src/test.cpp
index 9b1346274..6a0e991e2 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -49,9 +49,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	bool exception_thrown = false;\
 	try{ code; }\
 	catch(EType &e) { exception_thrown = true; }\
-	assert(exception_thrown);\
+	UASSERT(exception_thrown);\
 }
 
+#define UTEST(x, fmt, ...)\
+{\
+	if(!(x)){\
+		LOGLINEF(LMT_ERROR, "Test (%s) failed: " fmt, #x, ##__VA_ARGS__);\
+		test_failed = true;\
+	}\
+}
+
+#define UASSERT(x) UTEST(x, "UASSERT")
+
 /*
 	A few item and node definitions for those tests that need them
 */
@@ -127,30 +137,38 @@ void define_some_nodes(IWritableItemDefManager *idef, IWritableNodeDefManager *n
 	ndef->set(i, f);
 }
 
-struct TestUtilities
+struct TestBase
+{
+	bool test_failed;
+	TestBase():
+		test_failed(false)
+	{}
+};
+
+struct TestUtilities: public TestBase
 {
 	void Run()
 	{
 		/*infostream<<"wrapDegrees(100.0) = "<<wrapDegrees(100.0)<<std::endl;
 		infostream<<"wrapDegrees(720.5) = "<<wrapDegrees(720.5)<<std::endl;
 		infostream<<"wrapDegrees(-0.5) = "<<wrapDegrees(-0.5)<<std::endl;*/
-		assert(fabs(wrapDegrees(100.0) - 100.0) < 0.001);
-		assert(fabs(wrapDegrees(720.5) - 0.5) < 0.001);
-		assert(fabs(wrapDegrees(-0.5) - (-0.5)) < 0.001);
-		assert(fabs(wrapDegrees(-365.5) - (-5.5)) < 0.001);
-		assert(lowercase("Foo bAR") == "foo bar");
-		assert(is_yes("YeS") == true);
-		assert(is_yes("") == false);
-		assert(is_yes("FAlse") == false);
+		UASSERT(fabs(wrapDegrees(100.0) - 100.0) < 0.001);
+		UASSERT(fabs(wrapDegrees(720.5) - 0.5) < 0.001);
+		UASSERT(fabs(wrapDegrees(-0.5) - (-0.5)) < 0.001);
+		UASSERT(fabs(wrapDegrees(-365.5) - (-5.5)) < 0.001);
+		UASSERT(lowercase("Foo bAR") == "foo bar");
+		UASSERT(is_yes("YeS") == true);
+		UASSERT(is_yes("") == false);
+		UASSERT(is_yes("FAlse") == false);
 		const char *ends[] = {"abc", "c", "bc", NULL};
-		assert(removeStringEnd("abc", ends) == "");
-		assert(removeStringEnd("bc", ends) == "b");
-		assert(removeStringEnd("12c", ends) == "12");
-		assert(removeStringEnd("foo", ends) == "");
+		UASSERT(removeStringEnd("abc", ends) == "");
+		UASSERT(removeStringEnd("bc", ends) == "b");
+		UASSERT(removeStringEnd("12c", ends) == "12");
+		UASSERT(removeStringEnd("foo", ends) == "");
 	}
 };
 
-struct TestSettings
+struct TestSettings: public TestBase
 {
 	void Run()
 	{
@@ -162,27 +180,27 @@ struct TestSettings
 		s.parseConfigLine("floaty_thing = 1.1");
 		s.parseConfigLine("stringy_thing = asd /( ¤%&(/\" BLÖÄRP");
 		s.parseConfigLine("coord = (1, 2, 4.5)");
-		assert(s.getS32("leet") == 1337);
-		assert(s.getS16("leetleet") == 32767);
-		assert(s.getS16("leetleet_neg") == -32768);
+		UASSERT(s.getS32("leet") == 1337);
+		UASSERT(s.getS16("leetleet") == 32767);
+		UASSERT(s.getS16("leetleet_neg") == -32768);
 		// Not sure if 1.1 is an exact value as a float, but doesn't matter
-		assert(fabs(s.getFloat("floaty_thing") - 1.1) < 0.001);
-		assert(s.get("stringy_thing") == "asd /( ¤%&(/\" BLÖÄRP");
-		assert(fabs(s.getV3F("coord").X - 1.0) < 0.001);
-		assert(fabs(s.getV3F("coord").Y - 2.0) < 0.001);
-		assert(fabs(s.getV3F("coord").Z - 4.5) < 0.001);
+		UASSERT(fabs(s.getFloat("floaty_thing") - 1.1) < 0.001);
+		UASSERT(s.get("stringy_thing") == "asd /( ¤%&(/\" BLÖÄRP");
+		UASSERT(fabs(s.getV3F("coord").X - 1.0) < 0.001);
+		UASSERT(fabs(s.getV3F("coord").Y - 2.0) < 0.001);
+		UASSERT(fabs(s.getV3F("coord").Z - 4.5) < 0.001);
 		// Test the setting of settings too
 		s.setFloat("floaty_thing_2", 1.2);
 		s.setV3F("coord2", v3f(1, 2, 3.3));
-		assert(s.get("floaty_thing_2").substr(0,3) == "1.2");
-		assert(fabs(s.getFloat("floaty_thing_2") - 1.2) < 0.001);
-		assert(fabs(s.getV3F("coord2").X - 1.0) < 0.001);
-		assert(fabs(s.getV3F("coord2").Y - 2.0) < 0.001);
-		assert(fabs(s.getV3F("coord2").Z - 3.3) < 0.001);
+		UASSERT(s.get("floaty_thing_2").substr(0,3) == "1.2");
+		UASSERT(fabs(s.getFloat("floaty_thing_2") - 1.2) < 0.001);
+		UASSERT(fabs(s.getV3F("coord2").X - 1.0) < 0.001);
+		UASSERT(fabs(s.getV3F("coord2").Y - 2.0) < 0.001);
+		UASSERT(fabs(s.getV3F("coord2").Z - 3.3) < 0.001);
 	}
 };
 
-struct TestSerialization
+struct TestSerialization: public TestBase
 {
 	// To be used like this:
 	//   mkstr("Some\0string\0with\0embedded\0nuls")
@@ -196,19 +214,19 @@ struct TestSerialization
 	{
 		// Tests some serialization primitives
 
-		assert(serializeString("") == mkstr("\0\0"));
-		assert(serializeWideString(L"") == mkstr("\0\0"));
-		assert(serializeLongString("") == mkstr("\0\0\0\0"));
-		assert(serializeJsonString("") == "\"\"");
+		UASSERT(serializeString("") == mkstr("\0\0"));
+		UASSERT(serializeWideString(L"") == mkstr("\0\0"));
+		UASSERT(serializeLongString("") == mkstr("\0\0\0\0"));
+		UASSERT(serializeJsonString("") == "\"\"");
 		
 		std::string teststring = "Hello world!";
-		assert(serializeString(teststring) ==
+		UASSERT(serializeString(teststring) ==
 			mkstr("\0\14Hello world!"));
-		assert(serializeWideString(narrow_to_wide(teststring)) ==
+		UASSERT(serializeWideString(narrow_to_wide(teststring)) ==
 			mkstr("\0\14\0H\0e\0l\0l\0o\0 \0w\0o\0r\0l\0d\0!"));
-		assert(serializeLongString(teststring) ==
+		UASSERT(serializeLongString(teststring) ==
 			mkstr("\0\0\0\14Hello world!"));
-		assert(serializeJsonString(teststring) ==
+		UASSERT(serializeJsonString(teststring) ==
 			"\"Hello world!\"");
 
 		std::string teststring2;
@@ -228,15 +246,15 @@ struct TestSerialization
 			teststring2_w = tmp_os_w.str();
 			teststring2_w_encoded = tmp_os_w_encoded.str();
 		}
-		assert(serializeString(teststring2) ==
+		UASSERT(serializeString(teststring2) ==
 			mkstr("\1\0") + teststring2);
-		assert(serializeWideString(teststring2_w) ==
+		UASSERT(serializeWideString(teststring2_w) ==
 			mkstr("\1\0") + teststring2_w_encoded);
-		assert(serializeLongString(teststring2) ==
+		UASSERT(serializeLongString(teststring2) ==
 			mkstr("\0\0\1\0") + teststring2);
 		// MSVC fails when directly using "\\\\"
 		std::string backslash = "\\";
-		assert(serializeJsonString(teststring2) ==
+		UASSERT(serializeJsonString(teststring2) ==
 			mkstr("\"") +
 			"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007" +
 			"\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f" +
@@ -265,37 +283,37 @@ struct TestSerialization
 
 		{
 			std::istringstream is(serializeString(teststring2), std::ios::binary);
-			assert(deSerializeString(is) == teststring2);
-			assert(!is.eof());
+			UASSERT(deSerializeString(is) == teststring2);
+			UASSERT(!is.eof());
 			is.get();
-			assert(is.eof());
+			UASSERT(is.eof());
 		}
 		{
 			std::istringstream is(serializeWideString(teststring2_w), std::ios::binary);
-			assert(deSerializeWideString(is) == teststring2_w);
-			assert(!is.eof());
+			UASSERT(deSerializeWideString(is) == teststring2_w);
+			UASSERT(!is.eof());
 			is.get();
-			assert(is.eof());
+			UASSERT(is.eof());
 		}
 		{
 			std::istringstream is(serializeLongString(teststring2), std::ios::binary);
-			assert(deSerializeLongString(is) == teststring2);
-			assert(!is.eof());
+			UASSERT(deSerializeLongString(is) == teststring2);
+			UASSERT(!is.eof());
 			is.get();
-			assert(is.eof());
+			UASSERT(is.eof());
 		}
 		{
 			std::istringstream is(serializeJsonString(teststring2), std::ios::binary);
 			//dstream<<serializeJsonString(deSerializeJsonString(is));
-			assert(deSerializeJsonString(is) == teststring2);
-			assert(!is.eof());
+			UASSERT(deSerializeJsonString(is) == teststring2);
+			UASSERT(!is.eof());
 			is.get();
-			assert(is.eof());
+			UASSERT(is.eof());
 		}
 	}
 };
 
-struct TestCompress
+struct TestCompress: public TestBase
 {
 	void Run()
 	{
@@ -320,18 +338,18 @@ struct TestCompress
 		}
 		infostream<<std::endl;
 
-		assert(str_out.size() == 10);
+		UASSERT(str_out.size() == 10);
 
-		assert(str_out[0] == 0);
-		assert(str_out[1] == 0);
-		assert(str_out[2] == 0);
-		assert(str_out[3] == 4);
-		assert(str_out[4] == 0);
-		assert(str_out[5] == 1);
-		assert(str_out[6] == 1);
-		assert(str_out[7] == 5);
-		assert(str_out[8] == 0);
-		assert(str_out[9] == 1);
+		UASSERT(str_out[0] == 0);
+		UASSERT(str_out[1] == 0);
+		UASSERT(str_out[2] == 0);
+		UASSERT(str_out[3] == 4);
+		UASSERT(str_out[4] == 0);
+		UASSERT(str_out[5] == 1);
+		UASSERT(str_out[6] == 1);
+		UASSERT(str_out[7] == 5);
+		UASSERT(str_out[8] == 0);
+		UASSERT(str_out[9] == 1);
 
 		std::istringstream is(str_out, std::ios_base::binary);
 		std::ostringstream os2(std::ios_base::binary);
@@ -346,11 +364,11 @@ struct TestCompress
 		}
 		infostream<<std::endl;
 
-		assert(str_out2.size() == fromdata.getSize());
+		UASSERT(str_out2.size() == fromdata.getSize());
 
 		for(u32 i=0; i<str_out2.size(); i++)
 		{
-			assert(str_out2[i] == fromdata[i]);
+			UASSERT(str_out2[i] == fromdata[i]);
 		}
 
 		}
@@ -376,19 +394,6 @@ struct TestCompress
 		}
 		infostream<<std::endl;
 
-		/*assert(str_out.size() == 10);
-
-		assert(str_out[0] == 0);
-		assert(str_out[1] == 0);
-		assert(str_out[2] == 0);
-		assert(str_out[3] == 4);
-		assert(str_out[4] == 0);
-		assert(str_out[5] == 1);
-		assert(str_out[6] == 1);
-		assert(str_out[7] == 5);
-		assert(str_out[8] == 0);
-		assert(str_out[9] == 1);*/
-
 		std::istringstream is(str_out, std::ios_base::binary);
 		std::ostringstream os2(std::ios_base::binary);
 
@@ -402,37 +407,37 @@ struct TestCompress
 		}
 		infostream<<std::endl;
 
-		assert(str_out2.size() == fromdata.getSize());
+		UASSERT(str_out2.size() == fromdata.getSize());
 
 		for(u32 i=0; i<str_out2.size(); i++)
 		{
-			assert(str_out2[i] == fromdata[i]);
+			UASSERT(str_out2[i] == fromdata[i]);
 		}
 
 		}
 	}
 };
 
-struct TestMapNode
+struct TestMapNode: public TestBase
 {
 	void Run(INodeDefManager *nodedef)
 	{
 		MapNode n;
 
 		// Default values
-		assert(n.getContent() == CONTENT_AIR);
-		assert(n.getLight(LIGHTBANK_DAY, nodedef) == 0);
-		assert(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0);
+		UASSERT(n.getContent() == CONTENT_AIR);
+		UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0);
+		UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0);
 		
 		// Transparency
 		n.setContent(CONTENT_AIR);
-		assert(nodedef->get(n).light_propagates == true);
+		UASSERT(nodedef->get(n).light_propagates == true);
 		n.setContent(LEGN(nodedef, "CONTENT_STONE"));
-		assert(nodedef->get(n).light_propagates == false);
+		UASSERT(nodedef->get(n).light_propagates == false);
 	}
 };
 
-struct TestVoxelManipulator
+struct TestVoxelManipulator: public TestBase
 {
 	void Run(INodeDefManager *nodedef)
 	{
@@ -441,8 +446,8 @@ struct TestVoxelManipulator
 		*/
 
 		VoxelArea a(v3s16(-1,-1,-1), v3s16(1,1,1));
-		assert(a.index(0,0,0) == 1*3*3 + 1*3 + 1);
-		assert(a.index(-1,-1,-1) == 0);
+		UASSERT(a.index(0,0,0) == 1*3*3 + 1*3 + 1);
+		UASSERT(a.index(-1,-1,-1) == 0);
 		
 		VoxelArea c(v3s16(-2,-2,-2), v3s16(2,2,2));
 		// An area that is 1 bigger in x+ and z-
@@ -456,7 +461,7 @@ struct TestVoxelManipulator
 		results.push_back(VoxelArea(v3s16(-2,-2,-3),v3s16(3,2,-3)));
 		results.push_back(VoxelArea(v3s16(3,-2,-2),v3s16(3,2,2)));
 
-		assert(aa.size() == results.size());
+		UASSERT(aa.size() == results.size());
 		
 		infostream<<"Result of diff:"<<std::endl;
 		for(core::list<VoxelArea>::Iterator
@@ -466,7 +471,7 @@ struct TestVoxelManipulator
 			infostream<<std::endl;
 			
 			s32 j = results.linear_search(*i);
-			assert(j != -1);
+			UASSERT(j != -1);
 			results.erase(j, 1);
 		}
 
@@ -485,7 +490,7 @@ struct TestVoxelManipulator
 
 		v.print(infostream, nodedef);
 
- 		assert(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
+ 		UASSERT(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
 
 		infostream<<"*** Reading from inexistent (0,0,-1) ***"<<std::endl;
 
@@ -499,12 +504,12 @@ struct TestVoxelManipulator
 		
 		v.print(infostream, nodedef);
 
-		assert(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
+		UASSERT(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
 		EXCEPTION_CHECK(InvalidPositionException, v.getNode(v3s16(0,1,1)));
 	}
 };
 
-struct TestVoxelAlgorithms
+struct TestVoxelAlgorithms: public TestBase
 {
 	void Run(INodeDefManager *ndef)
 	{
@@ -527,8 +532,8 @@ struct TestVoxelAlgorithms
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, true, light_sources, ndef);
 				//v.print(dstream, ndef, VOXELPRINT_LIGHT_DAY);
-				assert(res.bottom_sunlight_valid == true);
-				assert(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
+				UASSERT(res.bottom_sunlight_valid == true);
+				UASSERT(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
 						== LIGHT_SUN);
 			}
 			v.setNodeNoRef(v3s16(0,0,0), MapNode(CONTENT_STONE));
@@ -537,8 +542,8 @@ struct TestVoxelAlgorithms
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, true, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == true);
-				assert(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
+				UASSERT(res.bottom_sunlight_valid == true);
+				UASSERT(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
 						== LIGHT_SUN);
 			}
 			{
@@ -546,8 +551,8 @@ struct TestVoxelAlgorithms
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, false, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == true);
-				assert(v.getNode(v3s16(2,0,2)).getLight(LIGHTBANK_DAY, ndef)
+				UASSERT(res.bottom_sunlight_valid == true);
+				UASSERT(v.getNode(v3s16(2,0,2)).getLight(LIGHTBANK_DAY, ndef)
 						== 0);
 			}
 			v.setNodeNoRef(v3s16(1,3,2), MapNode(CONTENT_STONE));
@@ -556,8 +561,8 @@ struct TestVoxelAlgorithms
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, true, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == true);
-				assert(v.getNode(v3s16(1,1,2)).getLight(LIGHTBANK_DAY, ndef)
+				UASSERT(res.bottom_sunlight_valid == true);
+				UASSERT(v.getNode(v3s16(1,1,2)).getLight(LIGHTBANK_DAY, ndef)
 						== 0);
 			}
 			{
@@ -565,8 +570,8 @@ struct TestVoxelAlgorithms
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, false, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == true);
-				assert(v.getNode(v3s16(1,0,2)).getLight(LIGHTBANK_DAY, ndef)
+				UASSERT(res.bottom_sunlight_valid == true);
+				UASSERT(v.getNode(v3s16(1,0,2)).getLight(LIGHTBANK_DAY, ndef)
 						== 0);
 			}
 			{
@@ -579,14 +584,14 @@ struct TestVoxelAlgorithms
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, true, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == true);
+				UASSERT(res.bottom_sunlight_valid == true);
 			}
 			{
 				core::map<v3s16, bool> light_sources;
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, false, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == true);
+				UASSERT(res.bottom_sunlight_valid == true);
 			}
 			{
 				MapNode n(CONTENT_AIR);
@@ -598,14 +603,14 @@ struct TestVoxelAlgorithms
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, true, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == false);
+				UASSERT(res.bottom_sunlight_valid == false);
 			}
 			{
 				core::map<v3s16, bool> light_sources;
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, false, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == false);
+				UASSERT(res.bottom_sunlight_valid == false);
 			}
 			v.setNodeNoRef(v3s16(1,3,2), MapNode(CONTENT_IGNORE));
 			{
@@ -613,7 +618,7 @@ struct TestVoxelAlgorithms
 				voxalgo::setLight(v, a, 0, ndef);
 				voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
 						v, a, true, light_sources, ndef);
-				assert(res.bottom_sunlight_valid == true);
+				UASSERT(res.bottom_sunlight_valid == true);
 			}
 		}
 		/*
@@ -642,18 +647,18 @@ struct TestVoxelAlgorithms
 				voxalgo::clearLightAndCollectSources(v, a, LIGHTBANK_DAY,
 						ndef, light_sources, unlight_from);
 				//v.print(dstream, ndef, VOXELPRINT_LIGHT_DAY);
-				assert(v.getNode(v3s16(0,1,1)).getLight(LIGHTBANK_DAY, ndef)
+				UASSERT(v.getNode(v3s16(0,1,1)).getLight(LIGHTBANK_DAY, ndef)
 						== 0);
-				assert(light_sources.find(v3s16(1,1,1)) != NULL);
-				assert(light_sources.size() == 1);
-				assert(unlight_from.find(v3s16(1,1,2)) != NULL);
-				assert(unlight_from.size() == 1);
+				UASSERT(light_sources.find(v3s16(1,1,1)) != NULL);
+				UASSERT(light_sources.size() == 1);
+				UASSERT(unlight_from.find(v3s16(1,1,2)) != NULL);
+				UASSERT(unlight_from.size() == 1);
 			}
 		}
 	}
 };
 
-struct TestInventory
+struct TestInventory: public TestBase
 {
 	void Run(IItemDefManager *idef)
 	{
@@ -734,14 +739,14 @@ struct TestInventory
 		Inventory inv(idef);
 		std::istringstream is(serialized_inventory, std::ios::binary);
 		inv.deSerialize(is);
-		assert(inv.getList("0"));
-		assert(!inv.getList("main"));
+		UASSERT(inv.getList("0"));
+		UASSERT(!inv.getList("main"));
 		inv.getList("0")->setName("main");
-		assert(!inv.getList("0"));
-		assert(inv.getList("main"));
+		UASSERT(!inv.getList("0"));
+		UASSERT(inv.getList("main"));
 		std::ostringstream inv_os(std::ios::binary);
 		inv.serialize(inv_os);
-		assert(inv_os.str() == serialized_inventory_2);
+		UASSERT(inv_os.str() == serialized_inventory_2);
 	}
 };
 
@@ -751,7 +756,7 @@ struct TestInventory
 		  interface for Map (IMap would be fine).
 */
 #if 0
-struct TestMapBlock
+struct TestMapBlock: public TestBase
 {
 	class TC : public NodeContainer
 	{
@@ -808,33 +813,33 @@ struct TestMapBlock
 		MapBlock b(&parent, v3s16(1,1,1));
 		v3s16 relpos(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE);
 
-		assert(b.getPosRelative() == relpos);
+		UASSERT(b.getPosRelative() == relpos);
 
-		assert(b.getBox().MinEdge.X == MAP_BLOCKSIZE);
-		assert(b.getBox().MaxEdge.X == MAP_BLOCKSIZE*2-1);
-		assert(b.getBox().MinEdge.Y == MAP_BLOCKSIZE);
-		assert(b.getBox().MaxEdge.Y == MAP_BLOCKSIZE*2-1);
-		assert(b.getBox().MinEdge.Z == MAP_BLOCKSIZE);
-		assert(b.getBox().MaxEdge.Z == MAP_BLOCKSIZE*2-1);
+		UASSERT(b.getBox().MinEdge.X == MAP_BLOCKSIZE);
+		UASSERT(b.getBox().MaxEdge.X == MAP_BLOCKSIZE*2-1);
+		UASSERT(b.getBox().MinEdge.Y == MAP_BLOCKSIZE);
+		UASSERT(b.getBox().MaxEdge.Y == MAP_BLOCKSIZE*2-1);
+		UASSERT(b.getBox().MinEdge.Z == MAP_BLOCKSIZE);
+		UASSERT(b.getBox().MaxEdge.Z == MAP_BLOCKSIZE*2-1);
 		
-		assert(b.isValidPosition(v3s16(0,0,0)) == true);
-		assert(b.isValidPosition(v3s16(-1,0,0)) == false);
-		assert(b.isValidPosition(v3s16(-1,-142,-2341)) == false);
-		assert(b.isValidPosition(v3s16(-124,142,2341)) == false);
-		assert(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
-		assert(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE,MAP_BLOCKSIZE-1)) == false);
+		UASSERT(b.isValidPosition(v3s16(0,0,0)) == true);
+		UASSERT(b.isValidPosition(v3s16(-1,0,0)) == false);
+		UASSERT(b.isValidPosition(v3s16(-1,-142,-2341)) == false);
+		UASSERT(b.isValidPosition(v3s16(-124,142,2341)) == false);
+		UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
+		UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE,MAP_BLOCKSIZE-1)) == false);
 
 		/*
 			TODO: this method should probably be removed
 			if the block size isn't going to be set variable
 		*/
-		/*assert(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE,
+		/*UASSERT(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE,
 				MAP_BLOCKSIZE, MAP_BLOCKSIZE));*/
 		
 		// Changed flag should be initially set
-		assert(b.getModified() == MOD_STATE_WRITE_NEEDED);
+		UASSERT(b.getModified() == MOD_STATE_WRITE_NEEDED);
 		b.resetModified();
-		assert(b.getModified() == MOD_STATE_CLEAN);
+		UASSERT(b.getModified() == MOD_STATE_CLEAN);
 
 		// All nodes should have been set to
 		// .d=CONTENT_IGNORE and .getLight() = 0
@@ -842,10 +847,10 @@ struct TestMapBlock
 		for(u16 y=0; y<MAP_BLOCKSIZE; y++)
 		for(u16 x=0; x<MAP_BLOCKSIZE; x++)
 		{
-			//assert(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_AIR);
-			assert(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_IGNORE);
-			assert(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_DAY) == 0);
-			assert(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_NIGHT) == 0);
+			//UASSERT(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_AIR);
+			UASSERT(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_IGNORE);
+			UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_DAY) == 0);
+			UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_NIGHT) == 0);
 		}
 		
 		{
@@ -867,15 +872,15 @@ struct TestMapBlock
 		MapNode n;
 		
 		// Positions in the block should still be valid
-		assert(b.isValidPositionParent(v3s16(0,0,0)) == true);
-		assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
+		UASSERT(b.isValidPositionParent(v3s16(0,0,0)) == true);
+		UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
 		n = b.getNodeParent(v3s16(0,MAP_BLOCKSIZE-1,0));
-		assert(n.getContent() == CONTENT_AIR);
+		UASSERT(n.getContent() == CONTENT_AIR);
 
 		// ...but outside the block they should be invalid
-		assert(b.isValidPositionParent(v3s16(-121,2341,0)) == false);
-		assert(b.isValidPositionParent(v3s16(-1,0,0)) == false);
-		assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == false);
+		UASSERT(b.isValidPositionParent(v3s16(-121,2341,0)) == false);
+		UASSERT(b.isValidPositionParent(v3s16(-1,0,0)) == false);
+		UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == false);
 		
 		{
 			bool exception_thrown = false;
@@ -887,16 +892,16 @@ struct TestMapBlock
 			{
 				exception_thrown = true;
 			}
-			assert(exception_thrown);
+			UASSERT(exception_thrown);
 		}
 
 		parent.position_valid = true;
 		// Now the positions outside should be valid
-		assert(b.isValidPositionParent(v3s16(-121,2341,0)) == true);
-		assert(b.isValidPositionParent(v3s16(-1,0,0)) == true);
-		assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == true);
+		UASSERT(b.isValidPositionParent(v3s16(-121,2341,0)) == true);
+		UASSERT(b.isValidPositionParent(v3s16(-1,0,0)) == true);
+		UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == true);
 		n = b.getNodeParent(v3s16(0,0,MAP_BLOCKSIZE));
-		assert(n.getContent() == 5);
+		UASSERT(n.getContent() == 5);
 
 		/*
 			Set a node
@@ -904,10 +909,10 @@ struct TestMapBlock
 		v3s16 p(1,2,0);
 		n.setContent(4);
 		b.setNode(p, n);
-		assert(b.getNode(p).getContent() == 4);
+		UASSERT(b.getNode(p).getContent() == 4);
 		//TODO: Update to new system
-		/*assert(b.getNodeTile(p) == 4);
-		assert(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/
+		/*UASSERT(b.getNodeTile(p) == 4);
+		UASSERT(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/
 		
 		/*
 			propagateSunlight()
@@ -934,21 +939,21 @@ struct TestMapBlock
 			parent.node.setLight(LIGHTBANK_NIGHT, 0);
 			core::map<v3s16, bool> light_sources;
 			// The bottom block is invalid, because we have a shadowing node
-			assert(b.propagateSunlight(light_sources) == false);
-			assert(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
-			assert(b.getNode(v3s16(1,3,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
-			assert(b.getNode(v3s16(1,2,0)).getLight(LIGHTBANK_DAY) == 0);
-			assert(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0);
-			assert(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0);
-			assert(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
-			assert(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN);
-			assert(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0);
-			assert(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0);
+			UASSERT(b.propagateSunlight(light_sources) == false);
+			UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
+			UASSERT(b.getNode(v3s16(1,3,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
+			UASSERT(b.getNode(v3s16(1,2,0)).getLight(LIGHTBANK_DAY) == 0);
+			UASSERT(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0);
+			UASSERT(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0);
+			UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
+			UASSERT(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN);
+			UASSERT(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0);
+			UASSERT(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0);
 			// According to MapBlock::getFaceLight,
 			// The face on the z+ side should have double-diminished light
-			//assert(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX)));
+			//UASSERT(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX)));
 			// The face on the z+ side should have diminished light
-			assert(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX));
+			UASSERT(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX));
 		}
 		/*
 			Check how the block handles being in between blocks with some non-sunlight
@@ -962,11 +967,11 @@ struct TestMapBlock
 			core::map<v3s16, bool> light_sources;
 			// The block below should be valid because there shouldn't be
 			// sunlight in there either
-			assert(b.propagateSunlight(light_sources, true) == true);
+			UASSERT(b.propagateSunlight(light_sources, true) == true);
 			// Should not touch nodes that are not affected (that is, all of them)
-			//assert(b.getNode(v3s16(1,2,3)).getLight() == LIGHT_SUN);
+			//UASSERT(b.getNode(v3s16(1,2,3)).getLight() == LIGHT_SUN);
 			// Should set light of non-sunlighted blocks to 0.
-			assert(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == 0);
+			UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == 0);
 		}
 		/*
 			Set up a situation where:
@@ -1002,12 +1007,12 @@ struct TestMapBlock
 			parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
 			core::map<v3s16, bool> light_sources;
 			// Bottom block is not valid
-			assert(b.propagateSunlight(light_sources) == false);
+			UASSERT(b.propagateSunlight(light_sources) == false);
 		}
 	}
 };
 
-struct TestMapSector
+struct TestMapSector: public TestBase
 {
 	class TC : public NodeContainer
 	{
@@ -1053,13 +1058,13 @@ struct TestMapSector
 		// Create one with no heightmaps
 		ServerMapSector sector(&parent, v2s16(1,1));
 		
-		assert(sector.getBlockNoCreateNoEx(0) == 0);
-		assert(sector.getBlockNoCreateNoEx(1) == 0);
+		UASSERT(sector.getBlockNoCreateNoEx(0) == 0);
+		UASSERT(sector.getBlockNoCreateNoEx(1) == 0);
 
 		MapBlock * bref = sector.createBlankBlock(-2);
 		
-		assert(sector.getBlockNoCreateNoEx(0) == 0);
-		assert(sector.getBlockNoCreateNoEx(-2) == bref);
+		UASSERT(sector.getBlockNoCreateNoEx(0) == 0);
+		UASSERT(sector.getBlockNoCreateNoEx(-2) == bref);
 		
 		//TODO: Check for AlreadyExistsException
 
@@ -1070,13 +1075,13 @@ struct TestMapSector
 		catch(InvalidPositionException &e){
 			exception_thrown = true;
 		}
-		assert(exception_thrown);*/
+		UASSERT(exception_thrown);*/
 
 	}
 };
 #endif
 
-struct TestCollision
+struct TestCollision: public TestBase
 {
 	void Run()
 	{
@@ -1094,38 +1099,38 @@ struct TestCollision
 				aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
 				v3f v(1, 0, 0);
 				f32 dtime = 0;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 0);
-				assert(fabs(dtime - 1.000) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+				UASSERT(fabs(dtime - 1.000) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
 				v3f v(-1, 0, 0);
 				f32 dtime = 0;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx-2, by+1.5, bz, bx-1, by+2.5, bz-1);
 				v3f v(1, 0, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
 				v3f v(0.5, 0.1, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 0);
-				assert(fabs(dtime - 3.000) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+				UASSERT(fabs(dtime - 3.000) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
 				v3f v(0.5, 0.1, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 0);
-				assert(fabs(dtime - 3.000) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+				UASSERT(fabs(dtime - 3.000) < 0.001);
 			}
 
 			// X+
@@ -1134,38 +1139,38 @@ struct TestCollision
 				aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
 				v3f v(-1, 0, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 0);
-				assert(fabs(dtime - 1.000) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+				UASSERT(fabs(dtime - 1.000) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
 				v3f v(1, 0, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx+2, by, bz+1.5, bx+3, by+1, bz+3.5);
 				v3f v(-1, 0, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
 				v3f v(-0.5, 0.2, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 1);  // Y, not X!
-				assert(fabs(dtime - 2.500) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);  // Y, not X!
+				UASSERT(fabs(dtime - 2.500) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 				aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
 				v3f v(-0.5, 0.3, 0);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 0);
-				assert(fabs(dtime - 2.000) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+				UASSERT(fabs(dtime - 2.000) < 0.001);
 			}
 
 			// TODO: Y-, Y+, Z-, Z+
@@ -1176,54 +1181,54 @@ struct TestCollision
 				aabb3f m(bx+2.3, by+2.29, bz+2.29, bx+4.2, by+4.2, bz+4.2);
 				v3f v(-1./3, -1./3, -1./3);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 0);
-				assert(fabs(dtime - 0.9) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+				UASSERT(fabs(dtime - 0.9) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
 				aabb3f m(bx+2.29, by+2.3, bz+2.29, bx+4.2, by+4.2, bz+4.2);
 				v3f v(-1./3, -1./3, -1./3);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 1);
-				assert(fabs(dtime - 0.9) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
+				UASSERT(fabs(dtime - 0.9) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
 				aabb3f m(bx+2.29, by+2.29, bz+2.3, bx+4.2, by+4.2, bz+4.2);
 				v3f v(-1./3, -1./3, -1./3);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 2);
-				assert(fabs(dtime - 0.9) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
+				UASSERT(fabs(dtime - 0.9) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
 				aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.3, by-2.29, bz-2.29);
 				v3f v(1./7, 1./7, 1./7);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 0);
-				assert(fabs(dtime - 16.1) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+				UASSERT(fabs(dtime - 16.1) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
 				aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.3, bz-2.29);
 				v3f v(1./7, 1./7, 1./7);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 1);
-				assert(fabs(dtime - 16.1) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
+				UASSERT(fabs(dtime - 16.1) < 0.001);
 			}
 			{
 				aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
 				aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.29, bz-2.3);
 				v3f v(1./7, 1./7, 1./7);
 				f32 dtime;
-				assert(axisAlignedCollision(s, m, v, 0, dtime) == 2);
-				assert(fabs(dtime - 16.1) < 0.001);
+				UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
+				UASSERT(fabs(dtime - 16.1) < 0.001);
 			}
 		}
 	}
 };
 
-struct TestSocket
+struct TestSocket: public TestBase
 {
 	void Run()
 	{
@@ -1246,12 +1251,12 @@ struct TestSocket
 				break;
 		}
 		//FIXME: This fails on some systems
-		assert(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer))==0);
-		assert(sender.getAddress() == Address(127,0,0,1, 0).getAddress());
+		UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer))==0);
+		UASSERT(sender.getAddress() == Address(127,0,0,1, 0).getAddress());
 	}
 };
 
-struct TestConnection
+struct TestConnection: public TestBase
 {
 	void TestHelpers()
 	{
@@ -1279,10 +1284,10 @@ struct TestConnection
 			Data:
 				[7] u8 data1[0]
 		*/
-		assert(readU32(&p1.data[0]) == proto_id);
-		assert(readU16(&p1.data[4]) == peer_id);
-		assert(readU8(&p1.data[6]) == channel);
-		assert(readU8(&p1.data[7]) == data1[0]);
+		UASSERT(readU32(&p1.data[0]) == proto_id);
+		UASSERT(readU16(&p1.data[4]) == peer_id);
+		UASSERT(readU8(&p1.data[6]) == channel);
+		UASSERT(readU8(&p1.data[7]) == data1[0]);
 		
 		//infostream<<"initial data1[0]="<<((u32)data1[0]&0xff)<<std::endl;
 
@@ -1294,10 +1299,10 @@ struct TestConnection
 				<<" p2[3]="<<((u32)p2[3]&0xff)<<std::endl;
 		infostream<<"data1[0]="<<((u32)data1[0]&0xff)<<std::endl;*/
 
-		assert(p2.getSize() == 3 + data1.getSize());
-		assert(readU8(&p2[0]) == TYPE_RELIABLE);
-		assert(readU16(&p2[1]) == seqnum);
-		assert(readU8(&p2[3]) == data1[0]);
+		UASSERT(p2.getSize() == 3 + data1.getSize());
+		UASSERT(readU8(&p2[0]) == TYPE_RELIABLE);
+		UASSERT(readU16(&p2[1]) == seqnum);
+		UASSERT(readU8(&p2[3]) == data1[0]);
 	}
 
 	struct Handler : public con::PeerHandler
@@ -1353,8 +1358,8 @@ struct TestConnection
 		infostream<<"** Creating client Connection"<<std::endl;
 		con::Connection client(proto_id, 512, 5.0, &hand_client);
 
-		assert(hand_server.count == 0);
-		assert(hand_client.count == 0);
+		UASSERT(hand_server.count == 0);
+		UASSERT(hand_client.count == 0);
 		
 		sleep_ms(50);
 		
@@ -1365,7 +1370,7 @@ struct TestConnection
 		sleep_ms(50);
 		
 		// Client should not have added client yet
-		assert(hand_client.count == 0);
+		UASSERT(hand_client.count == 0);
 		
 		try
 		{
@@ -1382,10 +1387,10 @@ struct TestConnection
 		}
 
 		// Client should have added server now
-		assert(hand_client.count == 1);
-		assert(hand_client.last_id == 1);
+		UASSERT(hand_client.count == 1);
+		UASSERT(hand_client.last_id == 1);
 		// Server should not have added client yet
-		assert(hand_server.count == 0);
+		UASSERT(hand_server.count == 0);
 		
 		sleep_ms(50);
 
@@ -1406,11 +1411,11 @@ struct TestConnection
 		}
 		
 		// Client should be the same
-		assert(hand_client.count == 1);
-		assert(hand_client.last_id == 1);
+		UASSERT(hand_client.count == 1);
+		UASSERT(hand_client.last_id == 1);
 		// Server should have the client
-		assert(hand_server.count == 1);
-		assert(hand_server.last_id == 2);
+		UASSERT(hand_server.count == 1);
+		UASSERT(hand_server.last_id == 2);
 		
 		//sleep_ms(50);
 
@@ -1469,7 +1474,7 @@ struct TestConnection
 					<<", size="<<size
 					<<", data="<<*data
 					<<std::endl;
-			assert(memcmp(*data, *recvdata, data.getSize()) == 0);
+			UASSERT(memcmp(*data, *recvdata, data.getSize()) == 0);
 		}
 #endif
 		u16 peer_id_client = 2;
@@ -1515,9 +1520,9 @@ struct TestConnection
 					<<", size="<<size
 					<<", data="<<*recvdata
 					<<std::endl;
-			assert(size == data1.getSize());
-			assert(memcmp(*data1, *recvdata, data1.getSize()) == 0);
-			assert(peer_id == PEER_ID_SERVER);
+			UASSERT(size == data1.getSize());
+			UASSERT(memcmp(*data1, *recvdata, data1.getSize()) == 0);
+			UASSERT(peer_id == PEER_ID_SERVER);
 			
 			infostream<<"** running client.Receive()"<<std::endl;
 			peer_id = 132;
@@ -1526,9 +1531,9 @@ struct TestConnection
 					<<", size="<<size
 					<<", data="<<*recvdata
 					<<std::endl;
-			assert(size == data2.getSize());
-			assert(memcmp(*data2, *recvdata, data2.getSize()) == 0);
-			assert(peer_id == PEER_ID_SERVER);
+			UASSERT(size == data2.getSize());
+			UASSERT(memcmp(*data2, *recvdata, data2.getSize()) == 0);
+			UASSERT(peer_id == PEER_ID_SERVER);
 			
 			bool got_exception = false;
 			try
@@ -1546,7 +1551,7 @@ struct TestConnection
 				infostream<<"** No incoming data for client"<<std::endl;
 				got_exception = true;
 			}
-			assert(got_exception);
+			UASSERT(got_exception);
 		}
 #endif
 #if 0
@@ -1628,7 +1633,7 @@ struct TestConnection
 				}
 				sleep_ms(10);
 			}
-			assert(received);
+			UASSERT(received);
 			infostream<<"** Client received: peer_id="<<peer_id
 					<<", size="<<size
 					<<std::endl;
@@ -1644,15 +1649,15 @@ struct TestConnection
 				infostream<<"...";
 			infostream<<std::endl;
 
-			assert(memcmp(*data1, *recvdata, data1.getSize()) == 0);
-			assert(peer_id == PEER_ID_SERVER);
+			UASSERT(memcmp(*data1, *recvdata, data1.getSize()) == 0);
+			UASSERT(peer_id == PEER_ID_SERVER);
 		}
 		
 		// Check peer handlers
-		assert(hand_client.count == 1);
-		assert(hand_client.last_id == 1);
-		assert(hand_server.count == 1);
-		assert(hand_server.last_id == 2);
+		UASSERT(hand_client.count == 1);
+		UASSERT(hand_client.last_id == 1);
+		UASSERT(hand_server.count == 1);
+		UASSERT(hand_server.last_id == 2);
 		
 		//assert(0);
 	}
@@ -1663,6 +1668,8 @@ struct TestConnection
 	X x;\
 	infostream<<"Running " #X <<std::endl;\
 	x.Run();\
+	tests_run++;\
+	tests_failed += x.test_failed ? 1 : 0;\
 }
 
 #define TESTPARAMS(X, ...)\
@@ -1670,11 +1677,16 @@ struct TestConnection
 	X x;\
 	infostream<<"Running " #X <<std::endl;\
 	x.Run(__VA_ARGS__);\
+	tests_run++;\
+	tests_failed += x.test_failed ? 1 : 0;\
 }
 
 void run_tests()
 {
 	DSTACK(__FUNCTION_NAME);
+
+	int tests_run = 0;
+	int tests_failed = 0;
 	
 	// Create item and node definitions
 	IWritableItemDefManager *idef = createItemDefManager();
@@ -1699,6 +1711,14 @@ void run_tests()
 		TEST(TestConnection);
 		dout_con<<"=== END RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
 	}
-	infostream<<"run_tests() passed"<<std::endl;
+	if(tests_failed == 0){
+		infostream<<"run_tests(): "<<tests_failed<<" / "<<tests_run<<" tests failed."<<std::endl;
+		infostream<<"run_tests() passed."<<std::endl;
+		return;
+	} else {
+		errorstream<<"run_tests(): "<<tests_failed<<" / "<<tests_run<<" tests failed."<<std::endl;
+		errorstream<<"run_tests() aborting."<<std::endl;
+		abort();
+	}
 }