Refactor PlayerTests