cleanup sources. fix tests.

CB-3620
Attach-detach disks