Proxy support
Proxy support
Added proxy support, cleaning up tests folder in preparation of new unit tests