Add disks handlers
Rewrite tests for disks