Proxy handling changed
Test updated