Add Expectation and some Matchers