Adding the KVP test cases