Revert "Revert "ProxyTest""

This reverts commit 35caf4433e7679c0b5fcc40b55f581289cd3a1ac.
Revert "Revert "Revert "ProxyTest"""

This reverts commit e34f84fad1b4a5c7c9f692a0a1301eba03a83981.