Merge "Update multiattach tests"