WIP: green; Removed name from matcher set; Introduced Expectation object for matcher wrapping; extracted buildFailureMessage code & now tested