Improve PlayerTest