add test> prefix, separate KVS, refactoring.