Untest keyvalue store code