Make tests more real.  Add ability to hit a proxy for tests.