Fix tests to run with different test runners.