Add -f option to test-runner to set output format