Refactored test file names