Pass test4, refactored