Improvements to serialization
Some new tests for storages