Making the new match framework more unit-test friendly