Merge "[KV] Add missing tests for handleCancel()"