I added JCLOUDS-370 and JCLOUDS-371 specifically to switch to mock webserver. This should also be separate from the other refactoring that needs to be done for autoscale when it is more stable.