Merge "Change NetworkInterfaceTest to use assertEquals"