Refactored some test names