avatar File->DiskFile as part of refactoring towards faster unit-tests