Feature/entities/disk

You might want to use our class DiskTestCase. It already handles most of the setup and teardown code.