Remove test followed by match.
Remove need for test.