Fix hanging watch_file test
Update resolver test in case of IPv6 (localhost resolves to both 127.0.0.1 and ::1)