Added MockPlayerBuilder and refactored tests