Fixed errors on ResultSetMatcher and addapted tests