Add tests of KeyValueStore