Cleanup expectation class.

Please run the spec tests for this commit. Also the grunt build task fails as the config file is missing.
![Thanks!](http://i.giphy.com/9yGa9mD2gyUnu.gif)