Merge "Add multihoming tests"