Merge "Add multiattach tests"