A few more tests around Game
A little hlint cleanup