diff --git a/stir-shaken/04.verify-200/stir_shaken_verify.cfg b/stir-shaken/04.verify-200/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/04.verify-200/stir_shaken_verify.cfg
+++ b/stir-shaken/04.verify-200/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/05.verify-200-anonymous/stir_shaken_verify.cfg b/stir-shaken/05.verify-200-anonymous/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/05.verify-200-anonymous/stir_shaken_verify.cfg
+++ b/stir-shaken/05.verify-200-anonymous/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/06.verify-error-400-wrong-from/stir_shaken_verify.cfg b/stir-shaken/06.verify-error-400-wrong-from/stir_shaken_verify.cfg
index ee3642f..21d1a92 100644
--- a/stir-shaken/06.verify-error-400-wrong-from/stir_shaken_verify.cfg
+++ b/stir-shaken/06.verify-error-400-wrong-from/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/07.verify-error-400-wrong-from-no-kill-call/stir_shaken_verify.cfg b/stir-shaken/07.verify-error-400-wrong-from-no-kill-call/stir_shaken_verify.cfg
index ee3642f..21d1a92 100644
--- a/stir-shaken/07.verify-error-400-wrong-from-no-kill-call/stir_shaken_verify.cfg
+++ b/stir-shaken/07.verify-error-400-wrong-from-no-kill-call/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/08.A.verify-error-403-wrong-date-past/stir_shaken_verify.cfg b/stir-shaken/08.A.verify-error-403-wrong-date-past/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/08.A.verify-error-403-wrong-date-past/stir_shaken_verify.cfg
+++ b/stir-shaken/08.A.verify-error-403-wrong-date-past/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/08.B.verify-error-403-wrong-date-future/stir_shaken_verify.cfg b/stir-shaken/08.B.verify-error-403-wrong-date-future/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/08.B.verify-error-403-wrong-date-future/stir_shaken_verify.cfg
+++ b/stir-shaken/08.B.verify-error-403-wrong-date-future/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/09.verify-error-403-wrong-iat/stir_shaken_verify.cfg b/stir-shaken/09.verify-error-403-wrong-iat/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/09.verify-error-403-wrong-iat/stir_shaken_verify.cfg
+++ b/stir-shaken/09.verify-error-403-wrong-iat/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/10.verify-error-428-no-identity/stir_shaken_verify.cfg b/stir-shaken/10.verify-error-428-no-identity/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/10.verify-error-428-no-identity/stir_shaken_verify.cfg
+++ b/stir-shaken/10.verify-error-428-no-identity/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/11.verify-error-436-no-info/stir_shaken_verify.cfg b/stir-shaken/11.verify-error-436-no-info/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/11.verify-error-436-no-info/stir_shaken_verify.cfg
+++ b/stir-shaken/11.verify-error-436-no-info/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/12.verify-error-436-token-no-4-params/stir_shaken_verify.cfg b/stir-shaken/12.verify-error-436-token-no-4-params/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/12.verify-error-436-token-no-4-params/stir_shaken_verify.cfg
+++ b/stir-shaken/12.verify-error-436-token-no-4-params/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/13.verify-error-436-x5u-diff-info/stir_shaken_verify.cfg b/stir-shaken/13.verify-error-436-x5u-diff-info/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/13.verify-error-436-x5u-diff-info/stir_shaken_verify.cfg
+++ b/stir-shaken/13.verify-error-436-x5u-diff-info/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/14.verify-error-437-no-alg/stir_shaken_verify.cfg b/stir-shaken/14.verify-error-437-no-alg/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/14.verify-error-437-no-alg/stir_shaken_verify.cfg
+++ b/stir-shaken/14.verify-error-437-no-alg/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/15.verify-error-437-wrong-alg/stir_shaken_verify.cfg b/stir-shaken/15.verify-error-437-wrong-alg/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/15.verify-error-437-wrong-alg/stir_shaken_verify.cfg
+++ b/stir-shaken/15.verify-error-437-wrong-alg/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/16.verify-error-437-wrong-header-alg/stir_shaken_verify.cfg b/stir-shaken/16.verify-error-437-wrong-header-alg/stir_shaken_verify.cfg
index 7fd17d9..a5953e2 100644
--- a/stir-shaken/16.verify-error-437-wrong-header-alg/stir_shaken_verify.cfg
+++ b/stir-shaken/16.verify-error-437-wrong-header-alg/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/17.verify-error-437-wrong-header-typ/stir_shaken_verify.cfg b/stir-shaken/17.verify-error-437-wrong-header-typ/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/17.verify-error-437-wrong-header-typ/stir_shaken_verify.cfg
+++ b/stir-shaken/17.verify-error-437-wrong-header-typ/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/18.verify-error-437-cert-expired/stir_shaken_verify.cfg b/stir-shaken/18.verify-error-437-cert-expired/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/18.verify-error-437-cert-expired/stir_shaken_verify.cfg
+++ b/stir-shaken/18.verify-error-437-cert-expired/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/19.verify-error-437-cert-in-future/stir_shaken_verify.cfg b/stir-shaken/19.verify-error-437-cert-in-future/stir_shaken_verify.cfg
index 7bf16cf..e48c202 100644
--- a/stir-shaken/19.verify-error-437-cert-in-future/stir_shaken_verify.cfg
+++ b/stir-shaken/19.verify-error-437-cert-in-future/stir_shaken_verify.cfg
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/20.verify-error-438-identity-more-4-params/stir_shaken_verify.cfg b/stir-shaken/20.verify-error-438-identity-more-4-params/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/20.verify-error-438-identity-more-4-params/stir_shaken_verify.cfg
+++ b/stir-shaken/20.verify-error-438-identity-more-4-params/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/21.verify-error-438-no-ppt/stir_shaken_verify.cfg b/stir-shaken/21.verify-error-438-no-ppt/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/21.verify-error-438-no-ppt/stir_shaken_verify.cfg
+++ b/stir-shaken/21.verify-error-438-no-ppt/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/22.verify-error-438-wrong-ppt/stir_shaken_verify.cfg b/stir-shaken/22.verify-error-438-wrong-ppt/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/22.verify-error-438-wrong-ppt/stir_shaken_verify.cfg
+++ b/stir-shaken/22.verify-error-438-wrong-ppt/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/23.verify-error-438-wrong-header-ppt/stir_shaken_verify.cfg b/stir-shaken/23.verify-error-438-wrong-header-ppt/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/23.verify-error-438-wrong-header-ppt/stir_shaken_verify.cfg
+++ b/stir-shaken/23.verify-error-438-wrong-header-ppt/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/24.verify-error-438-wrong-attest/stir_shaken_verify.cfg b/stir-shaken/24.verify-error-438-wrong-attest/stir_shaken_verify.cfg
index 7bf16cf..27176a6 100644
--- a/stir-shaken/24.verify-error-438-wrong-attest/stir_shaken_verify.cfg
+++ b/stir-shaken/24.verify-error-438-wrong-attest/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/25.verify-error-438-orig-diff-from/stir_shaken_verify.cfg b/stir-shaken/25.verify-error-438-orig-diff-from/stir_shaken_verify.cfg
index 957893a..2c8852e 100644
--- a/stir-shaken/25.verify-error-438-orig-diff-from/stir_shaken_verify.cfg
+++ b/stir-shaken/25.verify-error-438-orig-diff-from/stir_shaken_verify.cfg
@@ -92,7 +92,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -108,8 +108,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/26.verify-error-438-dest-diff-to/stir_shaken_verify.cfg b/stir-shaken/26.verify-error-438-dest-diff-to/stir_shaken_verify.cfg
index b0292af..7ede572 100644
--- a/stir-shaken/26.verify-error-438-dest-diff-to/stir_shaken_verify.cfg
+++ b/stir-shaken/26.verify-error-438-dest-diff-to/stir_shaken_verify.cfg
@@ -90,7 +90,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -106,8 +106,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/27.acc-stats-200/stir_shaken_verify.cfg b/stir-shaken/27.acc-stats-200/stir_shaken_verify.cfg
index df88d74..84a8f93 100644
--- a/stir-shaken/27.acc-stats-200/stir_shaken_verify.cfg
+++ b/stir-shaken/27.acc-stats-200/stir_shaken_verify.cfg
@@ -97,7 +97,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -113,8 +113,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/28.acc-stats-error-403-wrong-iat/stir_shaken_verify.cfg b/stir-shaken/28.acc-stats-error-403-wrong-iat/stir_shaken_verify.cfg
index d69cb61..da1799d 100644
--- a/stir-shaken/28.acc-stats-error-403-wrong-iat/stir_shaken_verify.cfg
+++ b/stir-shaken/28.acc-stats-error-403-wrong-iat/stir_shaken_verify.cfg
@@ -97,7 +97,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -113,8 +113,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error
diff --git a/stir-shaken/29.acc-stats-error-403-no-kill-call/stir_shaken_verify.cfg b/stir-shaken/29.acc-stats-error-403-no-kill-call/stir_shaken_verify.cfg
index df88d74..84a8f93 100644
--- a/stir-shaken/29.acc-stats-error-403-no-kill-call/stir_shaken_verify.cfg
+++ b/stir-shaken/29.acc-stats-error-403-no-kill-call/stir_shaken_verify.cfg
@@ -97,7 +97,7 @@ route[stir_shaken_verify]
         remove_hf("Identity");
     }
 
-    if ($var(stir_shaken_verify_rc) < -1) {
+    if ($var(stir_shaken_verify_rc) < 0) {
         xlog("L_ERR", "verify rc MAN: $var(stir_shaken_verify_rc)\n");
         xlog("L_ERR", "MAN: default err_code=$var(err_code) err_reason=$var(err_reason)\n");
 
@@ -113,8 +113,8 @@ route[stir_shaken_verify]
                 # No Identity or Date header found ==> default 428 Use Identity Header
                 #MAN No identity header -> 428 Use Identity Header
                 xlog("L_ERR", "No Identity or Date header found ==> default 428 Use Identity Header\n");
-                #$var(err_code) = 428;
-                #$var(err_reason) = "Use Identity Header";
+                $var(err_code) = 428;
+                $var(err_reason) = "Use Identity Header";
             break;
             case -3:
                 #MAN From and To malformed -> 400 Bad Request ==> default 500 Internal Server Error