Test name refactoring