added some tests for the storage
merge fix