renamed all occurences of match to game; improved model assoc specs