Move Matcher to test package
Bump version