Modified Game and added some more tests