Changing the matcher to be a standalone.
Adding the refactored test back in.
Changing to the new syntax.
Removed partial.
- pattern matching will be done through matcher and there is no longer a need for 2 ways to do things.