Add support for tests to use error mocks at the same time as normal mocks
Merge pull request #97 from setdirection/support-joint-mock-and-error-mock

Add support for tests to use error mocks at the same time as normal mock...