Modified unit test file names