Update some ToDo's
Implement unit tests for Matchmaker (suspect an intermittent bug in matching logic)
Adding more MatchMaker Tests