Fix to much of storage tests, still some weird stuff going on at FileListTests.