diff --git a/src/core/operations/CalculatePaymentKCV.mjs b/src/core/operations/CalculatePaymentKCV.mjs
index d53d2e9c..d900abb7 100644
--- a/src/core/operations/CalculatePaymentKCV.mjs
+++ b/src/core/operations/CalculatePaymentKCV.mjs
@@ -29,6 +29,13 @@ class CalculatePaymentKCV extends Operation {
                 name: "Random AES-CMAC sample",
                 input: "__RANDOM_AES_128_HEX__",
                 args: ["Hex", "AES-CMAC (Empty)", 6]
+            },
+            {
+                name: "Generate key then compute KCV",
+                recipeConfig: [
+                    { op: "Key Generate", args: ["AES-128 (16 bytes)", 16, false, false] },
+                    { op: "Payment Calculate KCV", args: ["Hex", "AES-CMAC (Empty)", 6] }
+                ]
             }
         ];
         this.infoURL = "https://en.wikipedia.org/wiki/Message_authentication_code";
diff --git a/src/core/operations/DeriveDUKPTAESKey.mjs b/src/core/operations/DeriveDUKPTAESKey.mjs
index 2bd31455..c061cd7e 100644
--- a/src/core/operations/DeriveDUKPTAESKey.mjs
+++ b/src/core/operations/DeriveDUKPTAESKey.mjs
@@ -292,7 +292,7 @@ class DeriveDUKPTAESKey extends Operation {
         this.testDataSamples = [
             {
                 name: "Derive IK from BDK",
-                input: "FEDCBA9876543210F1F1F1F1F1F1F1F1",
+                input: "__RANDOM_AES_128_HEX__",
                 args: ["BDK", "Derive IK", "123456789012345600000001", "PIN Encryption", false],
             },
         ];
diff --git a/src/core/operations/DeriveDUKPTKey.mjs b/src/core/operations/DeriveDUKPTKey.mjs
index 1541e9f3..56bb01bb 100644
--- a/src/core/operations/DeriveDUKPTKey.mjs
+++ b/src/core/operations/DeriveDUKPTKey.mjs
@@ -203,7 +203,7 @@ class DeriveDUKPTKey extends Operation {
         this.testDataSamples = [
             {
                 name: "Known transaction key vector",
-                input: "0123456789ABCDEFFEDCBA9876543210",
+                input: "__RANDOM_TDES_16_HEX__",
                 args: ["Derive Session Key", "FFFF9876543210E00008", "None", false]
             }
         ];
diff --git a/src/core/operations/GenerateAS2805KEKValidation.mjs b/src/core/operations/GenerateAS2805KEKValidation.mjs
index 8ba1f22f..e9c8d4d2 100644
--- a/src/core/operations/GenerateAS2805KEKValidation.mjs
+++ b/src/core/operations/GenerateAS2805KEKValidation.mjs
@@ -54,7 +54,7 @@ class GenerateAS2805KEKValidation extends Operation {
         this.testDataSamples = [
             {
                 name: "AS2805 request sample",
-                input: "0123456789ABCDEFFEDCBA9876543210",
+                input: "__RANDOM_TDES_16_HEX__",
                 args: ["KekValidationRequest", "TDES_2KEY", "VARIANT_MASK_82", "", true]
             }
         ];
diff --git a/src/core/operations/GenerateCardValidationData.mjs b/src/core/operations/GenerateCardValidationData.mjs
index 8009dccf..a61ec91f 100644
--- a/src/core/operations/GenerateCardValidationData.mjs
+++ b/src/core/operations/GenerateCardValidationData.mjs
@@ -26,6 +26,13 @@ class GenerateCardValidationData extends Operation {
                 name: "Known CVV2 test sample",
                 input: "0123456789ABCDEFFEDCBA9876543210",
                 args: ["CVV2 / CVC2 (force 000)", "4123456789012345", "02", "25", "MMYY", "101", 3, false]
+            },
+            {
+                name: "Generated CVK → CVV2",
+                recipeConfig: [
+                    { op: "Key Generate", args: ["AES-128 (16 bytes)", 16, false, false] },
+                    { op: "Card Validation Data Generate", args: ["CVV2 / CVC2 (force 000)", "4123456789012345", "02", "25", "MMYY", "101", 3, false] }
+                ]
             }
         ];
         this.infoURL = "https://en.wikipedia.org/wiki/Card_security_code";
diff --git a/src/core/operations/GenerateIBM3624PINOffset.mjs b/src/core/operations/GenerateIBM3624PINOffset.mjs
index 9f18d638..a1d9bdf2 100644
--- a/src/core/operations/GenerateIBM3624PINOffset.mjs
+++ b/src/core/operations/GenerateIBM3624PINOffset.mjs
@@ -23,7 +23,7 @@ class GenerateIBM3624PINOffset extends Operation {
         this.testDataSamples = [
             {
                 name: "IBM 3624 offset sample",
-                input: "1234",
+                input: "__RANDOM_PIN_4__",
                 args: ["0123456789ABCDEFFEDCBA9876543210", "0123456789012345", "5432101234567890", "F", true]
             }
         ];
diff --git a/src/core/operations/GeneratePaymentPINData.mjs b/src/core/operations/GeneratePaymentPINData.mjs
index fe4bdf4c..df594ce0 100644
--- a/src/core/operations/GeneratePaymentPINData.mjs
+++ b/src/core/operations/GeneratePaymentPINData.mjs
@@ -23,7 +23,7 @@ class GeneratePaymentPINData extends Operation {
         this.testDataSamples = [
             {
                 name: "Format 0 sample",
-                input: "1234",
+                input: "__RANDOM_PIN_4__",
                 args: ["ISO Format 0", "5432101234567890", false, false]
             }
         ];
diff --git a/src/core/operations/GenerateVISAPVV.mjs b/src/core/operations/GenerateVISAPVV.mjs
index 860eacb2..0b998ef4 100644
--- a/src/core/operations/GenerateVISAPVV.mjs
+++ b/src/core/operations/GenerateVISAPVV.mjs
@@ -23,7 +23,7 @@ class GenerateVISAPVV extends Operation {
         this.testDataSamples = [
             {
                 name: "VISA PVV sample",
-                input: "1234",
+                input: "__RANDOM_PIN_4__",
                 args: ["0123456789ABCDEFFEDCBA9876543210", "5432101234567890", 1, true]
             }
         ];