Fix catchup-test.php, but not extending test case yet