Make FileStorage initialization delayable
Updating test utility classes