Fixes for making unit tests pass, relative path changes for  proxymanager