Refactor test names for consistency