Modify MatchModelDao and MatchFilterV2 to be testable and modify MatchFilterTest to test MatchFilterV2