Merged changes to IP operations test.