Game state test refactorings