Merge "Fix attach_interfaces tests"