Share matchers between projects.

Also refactored to a more matchy kind of test to aid report generation