Refactor of the Expectation class. Now to implement
a custom expectation we only need to subclass it and
add our matchers.