Cleanup expectation class.

Please run the spec tests for this commit. Also the grunt build task fails as the config file is missing.
<img src="http://i.imgur.com/rDIQpV8.gif">