EXPECTF logic in run-tests.php is considerable, so let's avoid it.
# also some test fixes, more to follow