Modified the kv to fit the unit-test