Feature/entities/disk

Ahhhh I totally forgot about the sut initilization, which I copied from your network fetcher tests. Still getting my head around generics, thanks!