Fix some test problems under IPv6