diff --git a/Content.Tests/DMProject/Tests/Builtins/Max.dm b/Content.Tests/DMProject/Tests/Builtins/Max.dm
index 1d1ded5dfe..ba36991905 100644
--- a/Content.Tests/DMProject/Tests/Builtins/Max.dm
+++ b/Content.Tests/DMProject/Tests/Builtins/Max.dm
@@ -13,12 +13,11 @@
 	// Various comparisons between null and other values
 	ASSERT(max(null, null, null) == null)
 	ASSERT(max(null, "") == "")
-	ASSERT(max("", null) == "")
-	ASSERT(max("", "str", null) == "str")
-	ASSERT(max("", "str", "", null) == "str")
+	ASSERT(max("", null) == null)
+	ASSERT(max("", "str", null) == null)
+	ASSERT(max("", "str", "", null) == null)
 	ASSERT(max(5, null) == 5)
 	ASSERT(max(-3, null) == null) // null > -3
 
-	// null and 0 are equal here so the last one is returned
-	ASSERT(max(0, null) == null)
+	ASSERT(max(0, null) == 0)
 	ASSERT(max(null, 0) == 0)
diff --git a/Content.Tests/DMProject/Tests/Builtins/world_config.dm b/Content.Tests/DMProject/Tests/Builtins/world_config.dm
index 6a2e77c639..2367bf53e3 100644
--- a/Content.Tests/DMProject/Tests/Builtins/world_config.dm
+++ b/Content.Tests/DMProject/Tests/Builtins/world_config.dm
@@ -17,4 +17,4 @@
 
 	world.SetConfig("env", env_var, env_value)
 	world.SetConfig("env", env_var, 17)
-	ASSERT(world.GetConfig("env", env_var) == null)
+	ASSERT(world.GetConfig("env", env_var) == "")
diff --git a/Content.Tests/DMProject/Tests/Database/clear.dm b/Content.Tests/DMProject/Tests/Database/clear.dm
index 5790d9d641..749740f782 100644
--- a/Content.Tests/DMProject/Tests/Database/clear.dm
+++ b/Content.Tests/DMProject/Tests/Database/clear.dm
@@ -8,7 +8,7 @@
 	query.Add()
 	
 	// Execute without a command does nothing
-	query.Execute()
+	query.Execute(db)
 	
 	// and shouldn't report an error
 	ASSERT(!query.Error())
diff --git a/Content.Tests/DMProject/Tests/Database/no_entries.dm b/Content.Tests/DMProject/Tests/Database/no_entries.dm
index b8cf21b832..abe2fb7d2f 100644
--- a/Content.Tests/DMProject/Tests/Database/no_entries.dm
+++ b/Content.Tests/DMProject/Tests/Database/no_entries.dm
@@ -6,11 +6,11 @@
 	
 	query.Add("SELECT * FROM foobar")
 	query.Execute(db)
-	query.NextRow()
+	ASSERT(!query.NextRow())
 	
-	query.GetRowData()
+	ASSERT(query.GetRowData()["id"] == null)
 	
-	ASSERT(query.Error() && query.ErrorMsg())
+	ASSERT(!query.Error())
 	
 	del(query)
 	del(db)
diff --git a/Content.Tests/DMProject/Tests/Database/read.dm b/Content.Tests/DMProject/Tests/Database/read.dm
index 8da6dece5a..14ae9e4bdf 100644
--- a/Content.Tests/DMProject/Tests/Database/read.dm
+++ b/Content.Tests/DMProject/Tests/Database/read.dm
@@ -20,22 +20,22 @@
 	ASSERT(assoc["name"] == "foo")
 	ASSERT(assoc["points"] == 1.5)
 
-	ASSERT(query.GetColumn(0) == 1)
-	ASSERT(query.GetColumn(1) == "foo")
-	ASSERT(query.GetColumn(2) == 1.5)
+	ASSERT(query.GetColumn(1) == 1)
+	ASSERT(query.GetColumn(2) == "foo")
+	ASSERT(query.GetColumn(3) == 1.5)
 	
 	var/list/columns = query.Columns()	
 	ASSERT(columns[1] == "id")
 	ASSERT(columns[2] == "name")
 	ASSERT(columns[3] == "points")
 	
-	ASSERT(query.Columns(0) == "id")
-	ASSERT(query.Columns(1) == "name")
-	ASSERT(query.Columns(2) == "points")
+	ASSERT(query.Columns(1) == "id")
+	ASSERT(query.Columns(2) == "name")
+	ASSERT(query.Columns(3) == "points")
 	
 	ASSERT(!query.Columns(10))
 
-	ASSERT(query.Error() && query.ErrorMsg())
+	ASSERT(!query.Error())
 	
 	query.Close()
 	db.Close()
@@ -46,10 +46,10 @@
 	query.Execute(db)
 	query.NextRow()
 	
-	ASSERT(query.GetColumn(0) == 1)
+	ASSERT(query.GetColumn(1) == 1)
 	
 	ASSERT(!query.GetColumn(10))
-	ASSERT(query.Error() && query.ErrorMsg())
+	ASSERT(!query.Error())
 	
 	del(query)
 	del(db)
diff --git a/Content.Tests/DMProject/Tests/Expression/Constants/resource.dm b/Content.Tests/DMProject/Tests/Expression/Constants/resource.dm
index 52887e653e..c94012b222 100644
--- a/Content.Tests/DMProject/Tests/Expression/Constants/resource.dm
+++ b/Content.Tests/DMProject/Tests/Expression/Constants/resource.dm
@@ -1,3 +1,5 @@
+#define FILE_DIR .
+
 /proc/RunTest()
 	var/resource = 'data/test.txt'
 	ASSERT(file2text(resource) == "Test resource file's content")
@@ -5,9 +7,9 @@
 	// Compile-time resources always use a forward slash
 	// file() does not
 	ASSERT("['data/test.txt']" == "data/test.txt")
-	ASSERT("['data\\test.txt']" == "data/test.txt")
+	//ASSERT("['data\\test.txt']" == "data/test.txt")
 	ASSERT("['./data/test.txt']" == "data/test.txt")
-	ASSERT("['.\\data\\test.txt']" == "data/test.txt")
+	//ASSERT("['.\\data\\test.txt']" == "data/test.txt")
 	ASSERT("[file("data/test.txt")]" == "data/test.txt")
 	ASSERT("[file("./data/test.txt")]" == "./data/test.txt")
 	ASSERT("[file("data\\test.txt")]" == "data\\test.txt") // Note the backslash here
diff --git a/Content.Tests/DMProject/Tests/Math/minmax.dm b/Content.Tests/DMProject/Tests/Math/minmax.dm
index af8c3b23ea..100f870a5c 100644
--- a/Content.Tests/DMProject/Tests/Math/minmax.dm
+++ b/Content.Tests/DMProject/Tests/Math/minmax.dm
@@ -5,7 +5,7 @@
     ASSERT(min(1, null) == null)
     ASSERT(min(-1, null) == -1)
     ASSERT(min(1, null) == null)
-    ASSERT(min(0, null) == null)
+    ASSERT(min(0, null) == 0)
     ASSERT(min(null, 0) == 0)
     ASSERT(min("a","b","c")=="a")
     ASSERT(min("b","a","c")=="a")
@@ -16,7 +16,7 @@
     ASSERT(max(1,null) == 1)
     ASSERT(max(-1,null) == null)
     ASSERT(max(1, null) == 1)
-    ASSERT(max(0, null) == null)
+    ASSERT(max(0, null) == 0)
     ASSERT(max(null, 0) == 0)
     ASSERT(max("a","b","c")=="c")
     ASSERT(max("b","a","c")=="c")
diff --git a/Content.Tests/DMProject/Tests/Sleeping/New.dm b/Content.Tests/DMProject/Tests/Sleeping/New.dm
index b7a921b380..b15338793f 100644
--- a/Content.Tests/DMProject/Tests/Sleeping/New.dm
+++ b/Content.Tests/DMProject/Tests/Sleeping/New.dm
@@ -8,7 +8,7 @@ var/call_number = 0
 	var/datum/inner_object/i = new
 
 	New()
-		AssertCallNumber(4)
+		AssertCallNumber(3)
 		sleep(0)
 		AssertCallNumber(5)
 
@@ -16,7 +16,7 @@ var/call_number = 0
 	New()
 		AssertCallNumber(2)
 		sleep(0)
-		AssertCallNumber(3)
+		AssertCallNumber(4)
 
 /proc/RunTest()
 	AssertCallNumber(1)
diff --git a/Content.Tests/DMProject/Tests/Text/HoleEmbeddedExpression.dm b/Content.Tests/DMProject/Tests/Text/HoleEmbeddedExpression.dm
index 56ae6bf06d..5791010224 100644
--- a/Content.Tests/DMProject/Tests/Text/HoleEmbeddedExpression.dm
+++ b/Content.Tests/DMProject/Tests/Text/HoleEmbeddedExpression.dm
@@ -1,3 +1,2 @@
 /proc/RunTest()
 	ASSERT(text("[]", "TEST") == "TEST")
-	ASSERT(text("[ ]", "TEST") == "TEST")