Rewrote how mock service responses are done.  Test implementation thus far.