Merge "Add test for subnet gateway IPv4 and IPv6"