Fixed game logic and added test maps