Not asking you to change this now, but I'm curious why the Mock service is in the shipping code with the actual service?  I know it is for use in tests, but I would think it would be set up and configured for tests.  Is it used for other things as well?  The comment (which is above the class rather than as a docstring) suggests that it's only for unit tests.