Unit test fixes, avoiding redundant listeners for masqueradeHostChanges in PublicIpAddress