We are now successfully calling a mock Client function

Still needs some refactoring, but ClientTests now works, so I'm
beginning to have a little faith in the infrastructure.