diff --git a/4dev/tests/CoreLibsDBIOTest.php b/4dev/tests/CoreLibsDBIOTest.php
index 67df82b8..86f6129c 100644
--- a/4dev/tests/CoreLibsDBIOTest.php
+++ b/4dev/tests/CoreLibsDBIOTest.php
@@ -3386,8 +3386,37 @@ final class CoreLibsDBIOTest extends TestCase
 
 		// if this is a select query, db dbReturn, dbReturnRow, dbReturnArray too
 		if (preg_match("/^(select|show|with) /i", $query)) {
-			// TODO also tst dbReturnRow and dbReturnArray
-			$res = $db->dbReturn($query);
+			// dbReturn
+			$db->dbReturn($query);
+			$this->assertEquals(
+				$expected_rows,
+				$db->dbGetNumRows()
+			);
+			$this->assertEquals(
+				$expected_cols,
+				$db->dbGetNumFields()
+			);
+			$this->assertEquals(
+				$expected_col_names,
+				$db->dbGetFieldNames()
+			);
+			// dbReturnRow
+			// will return ALL rows there, but returns only the first
+			$db->dbReturnRow($query);
+			$this->assertEquals(
+				$expected_rows,
+				$db->dbGetNumRows()
+			);
+			$this->assertEquals(
+				$expected_cols,
+				$db->dbGetNumFields()
+			);
+			$this->assertEquals(
+				$expected_col_names,
+				$db->dbGetFieldNames()
+			);
+			// dbReturnArray
+			$db->dbReturnArray($query);
 			$this->assertEquals(
 				$expected_rows,
 				$db->dbGetNumRows()