Refactor test names