Refactoring towards new proxy behavior.  Also refactored proxy to
https test to remove non-determinism testing https against google