Removed no-proxy substitution, fixed tests. Bug 1309207