switch back to BaseStorage in BaseStorageTest