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

...s

@bsneed