Fixed KVM and KVC tests