Refactored Game and tests. Not perfect test coverage in game.