Impovements in MatchDAOImplTest