Use test-runner.sh instead of homegrown test.sh