kv test fixes