Fix tests, and refactor Game a wee bit

Change-Id: Ifb651f02dbc9b4e4d4e6b30fbdd955bdc3cad2f6