Refactored test names