Just to get it right, the changes to this test and all the related deletions are not strictly related to the actual matching change, right? Is it just to make this test a bit simpler?