Refactoring test names to be consistent