Improve mocking implementation
All mocking should occur at the client level