Made a test safeguard enforce its own rule instead of describing it

Two closely related matching rules in the test suite were written out separately and had already diverged, which meant the notes explaining how they relate could not actually hold. One is now built from the other, so the relationship is guaranteed rather than described.