Modified the unit-test for kv class