add-storage/metastore implementation with unit tests