Improve tests for attaching disks