Updated GameModel, added some test for models