Only add prefix when test file is present
Cleanup
Add 'echo' debugging runner
Ensure alternate file exists