IPv6 related changes and cleanups to test cases