improvements in MatchDAOImpl, MatchDAOImplTest and MatchDAOImplIntegTest