Cleaning up MatchingRule methods (MID-1926)
Fixing the tests after assignment schema change.