Move test lists to MatcherTests
Add AfterMatcher