Mods to preference / multiaddress unit tests.