Socks4 support and fixed socks tests (2)