Feature/entities/disk

You mean `testCancelFetch`?