Merge "Set KV MORE_DEBUG to false and add tests"