Squashed matchers refactor - matchers now unit-testable apart from Expectation and Spec.