Fix broken tests discovered after fixing the bug in the test running script