Fixed merge issue w/ ProxyTest
test