Refactor test for clarity
Moved matcher tests into matcher_test class.