separate handling of test-name and test-file-name. (#133)