Player tests and refactorings.