Refactoring for Player test