Changed interface for expectation checks

Removed redundant message and added 'addMessage' to allow more detail to
be added.