Tightening up game logic for more testing.