[BONOBO] MatchDao Tests. Some fixes from live test.