More test and improvements in MatchDAO