Optimized matching

I would rather see this test in matching.yml, possibly in another procedure, but the same file, to avoid duplicating setup stuff...