Added a basic expectation class, with tests