Added TestKeyValueStore and TestPerformance