Adding mock error message when expectation is not met.
Refactoring.
Fixing mock error handling.