Finishing MatchRepository and Fixing Tests