add unit tests for key value storage
fix key value name