Follow-up to r68544: restored the ability to run tests from separate files