Adding tests for proxymanager, refactoring proxymanager class