Merge "Refactor usage of custom_match tests"