Remove unecessary mention of the current class
Improve documentation
Use NonStrictExpectations insteamd of Expectations