Refactors Game, corrects test cases