Refactoring Players and tests