Added new tests to game_spec and abstracted some logic