Merge "Improve tests for InterfaceController add/remove address methods"