From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 13 Sep 2017 15:57:14 +0000 (-0400)
Subject: use "success" policy, instead of manual updates
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=361034d0b286f45f325d014b1d93bca094fcb02b;p=thirdparty%2Ffreeradius-server.git

use "success" policy, instead of manual updates
---

diff --git a/src/tests/keywords/3gpp b/src/tests/keywords/3gpp
index 05e3fb23e74..702816ec39d 100644
--- a/src/tests/keywords/3gpp
+++ b/src/tests/keywords/3gpp
@@ -14,6 +14,4 @@ update control {
 	Tmp-String-1 := "%{request:3GPP-IMSI}"
 }
 
-update reply {
-       Filter-Id := "filter"
-}
\ No newline at end of file
+success
diff --git a/src/tests/keywords/action-not-end-error b/src/tests/keywords/action-not-end-error
index b35ab1d448a..f38d9a7d427 100644
--- a/src/tests/keywords/action-not-end-error
+++ b/src/tests/keywords/action-not-end-error
@@ -4,10 +4,6 @@
 #  Static if condition
 #
 if (1) {
-	update reply {
-		Filter-Id := "filter"
-	}
-
 	#
 	#  We're not running the 'pap' module, so
 	#  we have to set this ourselves.
diff --git a/src/tests/keywords/action-return b/src/tests/keywords/action-return
index ac16bb40dcc..4484351feb7 100644
--- a/src/tests/keywords/action-return
+++ b/src/tests/keywords/action-return
@@ -4,9 +4,7 @@
 #  Static if condition
 #
 if (1) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 
 	#
 	#  We're not running the 'pap' module, so
diff --git a/src/tests/keywords/array b/src/tests/keywords/array
index a901a2bda99..3df3922a5e5 100644
--- a/src/tests/keywords/array
+++ b/src/tests/keywords/array
@@ -3,10 +3,6 @@
 #
 #  Tests for dereferencing the Nth attribute
 #
-update reply {
-	Filter-Id := "filter"
-}
-
 update request {
        Class := 0x01020304
        Class += 0x05060708
@@ -51,3 +47,5 @@ if (&Class[n] != 0x090a0b0c) {
 		Filter-Id += "fail 4"
 	}
 }
+
+success
diff --git a/src/tests/keywords/base64 b/src/tests/keywords/base64
index f4e90319dd3..b890ba430fc 100644
--- a/src/tests/keywords/base64
+++ b/src/tests/keywords/base64
@@ -1,10 +1,6 @@
 #
 # PRE: hex
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
 	Tmp-String-0        := '9870'
 	Tmp-Octets-0        := 0x39383731
@@ -139,3 +135,5 @@ if (Tmp-String-3 != 'IDk4Nz4=') {
 		Filter-Id += 'fail 12'
 	}
 }
+
+success
diff --git a/src/tests/keywords/break-error b/src/tests/keywords/break-error
index fff20f085b4..8c2e51ebc40 100644
--- a/src/tests/keywords/break-error
+++ b/src/tests/keywords/break-error
@@ -2,10 +2,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 if (User-Name == "bob") {
 	break			# ERROR
 }
diff --git a/src/tests/keywords/case-empty b/src/tests/keywords/case-empty
index 46ea0548c69..3e6c6181add 100644
--- a/src/tests/keywords/case-empty
+++ b/src/tests/keywords/case-empty
@@ -1,9 +1,5 @@
 # PRE: switch
 #
-update reply {
-	Filter-Id := "filter"
-}
-
 switch &reply:Filter-Id {
 	# deliberately empty
 	case "filter" {
@@ -16,8 +12,6 @@ switch &reply:Filter-Id {
 	}
 
 	case {
-		update reply {
-			Filter-Id := "default"
-		}
+		success
 	}
 }
diff --git a/src/tests/keywords/case-empty-string b/src/tests/keywords/case-empty-string
index 4b8e7cd75fa..85c790a8d49 100644
--- a/src/tests/keywords/case-empty-string
+++ b/src/tests/keywords/case-empty-string
@@ -6,9 +6,7 @@ update request {
 
 switch &Filter-Id {
 	case "" {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 	}
 
 	case "doug" {
diff --git a/src/tests/keywords/cast-byte b/src/tests/keywords/cast-byte
index 4663d95a5df..b4772c86342 100644
--- a/src/tests/keywords/cast-byte
+++ b/src/tests/keywords/cast-byte
@@ -7,9 +7,7 @@ update {
 }
 
 if (<byte>Class == 173) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
 
 if (<byte>Class < 173) {
diff --git a/src/tests/keywords/cast-integer b/src/tests/keywords/cast-integer
index 4972ee74598..0f88aca38c8 100644
--- a/src/tests/keywords/cast-integer
+++ b/src/tests/keywords/cast-integer
@@ -7,9 +7,7 @@ update {
 }
 
 if (<integer>Class == 257) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
 
 if (<integer>Class < 256) {
diff --git a/src/tests/keywords/cast-short b/src/tests/keywords/cast-short
index a17b3799076..70f3fdd13e4 100644
--- a/src/tests/keywords/cast-short
+++ b/src/tests/keywords/cast-short
@@ -7,9 +7,7 @@ update {
 }
 
 if (<short>Class == 257) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
 
 if (<short>Class < 256) {
diff --git a/src/tests/keywords/cmp b/src/tests/keywords/cmp
index 4cd59b80754..67e4e6b2539 100644
--- a/src/tests/keywords/cmp
+++ b/src/tests/keywords/cmp
@@ -14,7 +14,5 @@ update request {
 #  Check attribute references
 #
 if (Called-Station-Id == &Calling-Station-Id) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
diff --git a/src/tests/keywords/cmp-ipaddr b/src/tests/keywords/cmp-ipaddr
index c7355c58fc0..76e1997bd3a 100644
--- a/src/tests/keywords/cmp-ipaddr
+++ b/src/tests/keywords/cmp-ipaddr
@@ -1,9 +1,6 @@
 #
 #  PRE: update
 #
-update reply {
-	Filter-Id := "filter"
-}
 update control {
        Cleartext-Password := 'hello'
 }
@@ -44,3 +41,5 @@ if (NAS-IP-Address > &Framed-IP-Address) {
 		Filter-Id += "fail"
 	}
 }
+
+success
diff --git a/src/tests/keywords/count-error b/src/tests/keywords/count-error
index f0723cb56b7..419db002339 100644
--- a/src/tests/keywords/count-error
+++ b/src/tests/keywords/count-error
@@ -2,10 +2,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
 	Tmp-String-0 := &reply:Filter-Id[#]	# ERROR
 }
diff --git a/src/tests/keywords/else-empty-error b/src/tests/keywords/else-empty-error
index e39651ba703..4a1880f8617 100644
--- a/src/tests/keywords/else-empty-error
+++ b/src/tests/keywords/else-empty-error
@@ -3,9 +3,7 @@
 #
 
 if (&User-Name == 'bob') {
-	update reply {
-		Filter-Id := "filter"
-	}
+	ok
 }
 else {	# ERROR
 	# empty is not allowed
diff --git a/src/tests/keywords/else-error b/src/tests/keywords/else-error
index 3816270ecda..077511510ac 100644
--- a/src/tests/keywords/else-error
+++ b/src/tests/keywords/else-error
@@ -4,8 +4,8 @@
 #  "else" has to be preceded by an "if" or "elsif"
 #
 if (1) {
-	update reply {
-		Filter-Id := "filter"
+	update control {
+		Cleartext-Password := "fail"
 	}
 
 	else {	# ERROR
diff --git a/src/tests/keywords/escape b/src/tests/keywords/escape
index 5d0b3bc2fd2..d4a11972c91 100644
--- a/src/tests/keywords/escape
+++ b/src/tests/keywords/escape
@@ -3,7 +3,6 @@
 #
 update request {
         control:Cleartext-Password := 'hello'
-        reply:Filter-Id := "filter"
 
 	Tmp-String-0 := '@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /'
 	Tmp-String-1 := '±§#$%^&+={[}];<,>?`|"'
@@ -65,3 +64,4 @@ if (<string>"%{unescape:%{request:Tmp-String-7}}" != &Tmp-String-6) {
 	}
 }
 
+success
diff --git a/src/tests/keywords/escape-sequences b/src/tests/keywords/escape-sequences
index 967656df147..684f6cbdc28 100644
--- a/src/tests/keywords/escape-sequences
+++ b/src/tests/keywords/escape-sequences
@@ -15,8 +15,6 @@ update request {
 
 	Tmp-String-2 := 'i have scary embedded things\000 inside me'
 	Tmp-String-2 += "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°"
-
-	reply:Filter-Id := "filter"
 }
 
 
@@ -93,3 +91,5 @@ if (&Tmp-String-2[1] != "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°") {
 		Filter-Id += 'fail 9'
 	}
 }
+
+success
diff --git a/src/tests/keywords/expr b/src/tests/keywords/expr
index 7645931bdc6..2a13d2c4906 100644
--- a/src/tests/keywords/expr
+++ b/src/tests/keywords/expr
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-	Filter-Id := "filter"
-}
-
 #
 #  Simple
 #
@@ -106,3 +102,4 @@ if ("%{expr: 6 * -&Tmp-Integer-2}" != -24) {
 	}
 }
 
+success
diff --git a/src/tests/keywords/foreach-break-2 b/src/tests/keywords/foreach-break-2
index b1f60407a6a..e2190d41d76 100644
--- a/src/tests/keywords/foreach-break-2
+++ b/src/tests/keywords/foreach-break-2
@@ -31,10 +31,7 @@ foreach control:Tmp-String-0 {
 		update request {
 			Called-Station-Id := "%{1}"
 		}
-		update reply {
-			Filter-Id := "filter"
-		}
-
+		success
 		break
 	}
 	elsif ("%{Foreach-Variable-0}" == '9') {
diff --git a/src/tests/keywords/foreach-break-3 b/src/tests/keywords/foreach-break-3
index af03da63808..056b4392fef 100644
--- a/src/tests/keywords/foreach-break-3
+++ b/src/tests/keywords/foreach-break-3
@@ -28,10 +28,7 @@ update control {
 
 foreach &control:Calling-Station-Id {
 	if (&request:Calling-Station-Id == "%{Foreach-Variable-0}") {
-		update reply {
-			Filter-Id := "filter"
-		}
-
+		success
 		break
 	}
 	elsif ("%{Foreach-Variable-0}" == '9') {
diff --git a/src/tests/keywords/foreach-break-4 b/src/tests/keywords/foreach-break-4
index 037af8ead44..cabe9eb7de2 100644
--- a/src/tests/keywords/foreach-break-4
+++ b/src/tests/keywords/foreach-break-4
@@ -28,10 +28,7 @@ update control {
 
 foreach &control:Calling-Station-Id {
 	if (&request:Calling-Station-Id == "%{Foreach-Variable-0}") {
-		update reply {
-			Filter-Id := "filter"
-		}
-
+		success
 		break
 	}
 	elsif ("%{Foreach-Variable-0}" == '9') {
diff --git a/src/tests/keywords/foreach-isolation b/src/tests/keywords/foreach-isolation
index b77806dcff7..78aad162de6 100644
--- a/src/tests/keywords/foreach-isolation
+++ b/src/tests/keywords/foreach-isolation
@@ -3,7 +3,6 @@
 #
 
 update {
-	&reply:Filter-Id := 'filter'
 	&control:Tmp-String-0 := '0'
 	&control:Tmp-String-0 += '1'
 	&control:Tmp-String-0 += '2'
@@ -36,3 +35,5 @@ if (!&control:Tmp-String-0[0] || &control:Tmp-String-0[1] || &control:Tmp-String
 		Filter-Id += 'Fail 2'
 	}
 }
+
+success
diff --git a/src/tests/keywords/foreach-return b/src/tests/keywords/foreach-return
index 05409c92fdc..115175a7c4b 100644
--- a/src/tests/keywords/foreach-return
+++ b/src/tests/keywords/foreach-return
@@ -18,9 +18,7 @@ update request {
 
 foreach &Filter-Id {
 	if ("%{Foreach-Variable-0}" == "3") {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 
 		#
 		#  We need this because the "return" below
diff --git a/src/tests/keywords/foreach-varied-depth b/src/tests/keywords/foreach-varied-depth
index 3c3918d6c2b..cf9f4dbfbef 100644
--- a/src/tests/keywords/foreach-varied-depth
+++ b/src/tests/keywords/foreach-varied-depth
@@ -1,7 +1,6 @@
 update {
 	control:Tmp-String-0 := "ssid=ABCDEF"
 	control:Tmp-String-0 += "ssid=GHIJKL"
-	reply:Filter-Id := "filter"
 }
 
 if (User-Name) {
@@ -41,3 +40,5 @@ if (&control:Tmp-String-1 != 'ssid=GHIJKL') {
 update control {
 	Tmp-String-1 !* ANY
 }
+
+success
diff --git a/src/tests/keywords/hex b/src/tests/keywords/hex
index 0ad8929c511..3d2e9c2dba3 100644
--- a/src/tests/keywords/hex
+++ b/src/tests/keywords/hex
@@ -1,10 +1,6 @@
 #
 # PRE: update
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
 	Tmp-String-0        := '9870'
 	Tmp-Octets-0        := 0x39383731
@@ -139,3 +135,5 @@ if (Tmp-String-3 != '203938373e') {
 		Filter-Id += 'fail 14'
 	}
 }
+
+success
diff --git a/src/tests/keywords/if b/src/tests/keywords/if
index a1460295ea2..136ca4041a0 100644
--- a/src/tests/keywords/if
+++ b/src/tests/keywords/if
@@ -4,7 +4,5 @@
 #  Static if condition
 #
 if (1) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
diff --git a/src/tests/keywords/if-bob b/src/tests/keywords/if-bob
index 4e8ae3c67fc..066cbee2be2 100644
--- a/src/tests/keywords/if-bob
+++ b/src/tests/keywords/if-bob
@@ -3,13 +3,11 @@
 #  Matching "if" conditions
 #
 if (User-Name == "bob") {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
 
 if (User-Name != "bob") {
 	update reply {
 		Filter-Id := "not bob"
 	}
-}
\ No newline at end of file
+}
diff --git a/src/tests/keywords/if-else b/src/tests/keywords/if-else
index 788d60668cb..43f8d2b6fe5 100644
--- a/src/tests/keywords/if-else
+++ b/src/tests/keywords/if-else
@@ -9,7 +9,5 @@ if (User-Name != "bob") {
 	}
 }
 else {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
diff --git a/src/tests/keywords/if-elsif b/src/tests/keywords/if-elsif
index c0a41ed6698..c326e7ba6fe 100644
--- a/src/tests/keywords/if-elsif
+++ b/src/tests/keywords/if-elsif
@@ -8,9 +8,7 @@ if (User-Name != "bob") {
 	}
 }
 elsif (User-Name == "bob") {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
 else {
 	update reply {
diff --git a/src/tests/keywords/if-empty-allow b/src/tests/keywords/if-empty-allow
index 745f465681c..493c6a32abe 100644
--- a/src/tests/keywords/if-empty-allow
+++ b/src/tests/keywords/if-empty-allow
@@ -16,6 +16,4 @@ elsif (1) {
   # we allow empty 'elsif' conditions
 }
 
-update reply {
-	Filter-Id := "filter"
-}
+success
diff --git a/src/tests/keywords/if-multivalue b/src/tests/keywords/if-multivalue
index f12d6fe0e02..9378600d9ef 100644
--- a/src/tests/keywords/if-multivalue
+++ b/src/tests/keywords/if-multivalue
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -171,3 +170,5 @@ if (!(&request:Tmp-Integer-0[*] < 10)) {
 		Filter-Id += 'fail 16'
 	}
 }
+
+success
diff --git a/src/tests/keywords/if-paircmp b/src/tests/keywords/if-paircmp
index 6ed06e3fb53..eae1ea1811b 100644
--- a/src/tests/keywords/if-paircmp
+++ b/src/tests/keywords/if-paircmp
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 #
@@ -25,3 +24,5 @@ if (&Test-Paircmp == 'no') {
 		Filter-Id += 'fail 2'
 	}
 }
+
+success
diff --git a/src/tests/keywords/if-rcode-error b/src/tests/keywords/if-rcode-error
index fed8a49d32b..ca80d710566 100644
--- a/src/tests/keywords/if-rcode-error
+++ b/src/tests/keywords/if-rcode-error
@@ -3,9 +3,7 @@
 #  return code in an "if" section.
 #
 if (User-Name == "bob") {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 
 	ok = reject	# ERROR
 }
diff --git a/src/tests/keywords/if-regex-bad-attribute b/src/tests/keywords/if-regex-bad-attribute
index f330fde01e9..99fb299f4fb 100644
--- a/src/tests/keywords/if-regex-bad-attribute
+++ b/src/tests/keywords/if-regex-bad-attribute
@@ -6,16 +6,12 @@
 #  This should parse
 #
 if (&User-Name =~ /%{User-Name}/) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	ok
 }
 
 #
 #  Check regexes which refer to unknown attributes
 #
 if (&User-Name =~ /%{What-The-Heck-Is-This-Thing}/) {	# ERROR
-	update reply {
-		Filter-Id := "filter"
-	}
+	ok
 }
diff --git a/src/tests/keywords/if-regex-empty b/src/tests/keywords/if-regex-empty
index 18e89f64659..3e352dec612 100644
--- a/src/tests/keywords/if-regex-empty
+++ b/src/tests/keywords/if-regex-empty
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 if (control:Cleartext-Password !~ /hell(o)(.*)/) {
@@ -44,3 +43,5 @@ if ("%{1}") {
 		Filter-Id += 'Fail 5'
 	}
 }
+
+success
diff --git a/src/tests/keywords/if-regex-error b/src/tests/keywords/if-regex-error
index f618e8290d9..051f10199a7 100644
--- a/src/tests/keywords/if-regex-error
+++ b/src/tests/keywords/if-regex-error
@@ -6,7 +6,5 @@
 #  Check that bad regular expressions will fail
 #
 if (&User-Name =~ /[a-3]/) {	# ERROR
-	update reply {
-		Filter-Id := "filter"
-	}
+	ok
 }
diff --git a/src/tests/keywords/if-regex-multivalue b/src/tests/keywords/if-regex-multivalue
index 7358c9336db..9aa75dad52e 100644
--- a/src/tests/keywords/if-regex-multivalue
+++ b/src/tests/keywords/if-regex-multivalue
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -24,3 +23,5 @@ else {
 		Filter-Id += 'Fail 2'
 	}
 }
+
+success
diff --git a/src/tests/keywords/if-skip b/src/tests/keywords/if-skip
index 0e74f2218a2..74fb90a46c7 100644
--- a/src/tests/keywords/if-skip
+++ b/src/tests/keywords/if-skip
@@ -37,6 +37,4 @@ else {
 	no-such-module
 }
 
-update reply {
-	Filter-Id := "filter"
-}
+success
diff --git a/src/tests/keywords/integer b/src/tests/keywords/integer
index 4e2c9f69439..31370e9653b 100644
--- a/src/tests/keywords/integer
+++ b/src/tests/keywords/integer
@@ -1,10 +1,6 @@
 #
 # PRE: update
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
 	Tmp-String-0        := '9870'
 	Tmp-String-1        := '98709870'
@@ -211,6 +207,4 @@ if (Tmp-String-4 != '959985470') {
 	}
 }
 
-
-
-
+success
diff --git a/src/tests/keywords/ipaddr b/src/tests/keywords/ipaddr
index 3010a236fe3..313d351907a 100644
--- a/src/tests/keywords/ipaddr
+++ b/src/tests/keywords/ipaddr
@@ -3,7 +3,6 @@
 #
 update control {
        Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 update request {
@@ -49,3 +48,5 @@ if (Tmp-IP-Address-3 != 127.0.0.4) {
 		Filter-Id += "fail 5"
 	}
 }
+
+success
diff --git a/src/tests/keywords/ipaddr.raw b/src/tests/keywords/ipaddr.raw
index 6b798170b50..9c37b096476 100644
--- a/src/tests/keywords/ipaddr.raw
+++ b/src/tests/keywords/ipaddr.raw
@@ -3,7 +3,6 @@
 #
 update control {
        Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 #
@@ -29,4 +28,6 @@ else {
 			Filter-Id := "filter"
 		}
 	}
-}
\ No newline at end of file
+}
+
+success
diff --git a/src/tests/keywords/ipprefix b/src/tests/keywords/ipprefix
index 0ab8dce206e..79862e058a5 100644
--- a/src/tests/keywords/ipprefix
+++ b/src/tests/keywords/ipprefix
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-	Filter-Id := "filter"
-}
-
 update control {
 	Tmp-Cast-IPv4Prefix := 198.51.100.255/16
 	Tmp-Cast-IPv6Prefix := ::198.51.100.255/112
@@ -50,3 +46,5 @@ if (!(&control:Framed-IP-Address < 198.51.0.0/16)) {
 		Filter-Id += "Fail 5"
 	}
 }
+
+success
diff --git a/src/tests/keywords/length b/src/tests/keywords/length
index 75274531c87..df92f01f9aa 100644
--- a/src/tests/keywords/length
+++ b/src/tests/keywords/length
@@ -1,10 +1,6 @@
 #
 # PRE: hex
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
 	Tmp-String-0        := '\
 abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\
@@ -153,3 +149,5 @@ if (Tmp-Integer-3 != 5) {
 		Filter-Id += 'fail 15'
 	}
 }
+
+success
diff --git a/src/tests/keywords/load-balance b/src/tests/keywords/load-balance
index d07939afcc6..bed8a65a0a7 100644
--- a/src/tests/keywords/load-balance
+++ b/src/tests/keywords/load-balance
@@ -91,7 +91,5 @@ if ((&Tmp-Integer-0 == 0) || (&Tmp-Integer-1 == 0)) {
 	}
 }
 else {
-	update reply {
-		Filter-Id := 'filter'
-	}
+	success
 }
diff --git a/src/tests/keywords/log b/src/tests/keywords/log
index 97a2557b683..afc589a6375 100644
--- a/src/tests/keywords/log
+++ b/src/tests/keywords/log
@@ -2,6 +2,4 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success
diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat
index 24446a522fd..aa0132f9aff 100644
--- a/src/tests/keywords/map-xlat
+++ b/src/tests/keywords/map-xlat
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 update {
@@ -23,3 +22,5 @@ if (&control:Tmp-String-0 != 'testing123') {
         Filter-Id += 'Fail 1'
     }
 }
+
+success
diff --git a/src/tests/keywords/md5 b/src/tests/keywords/md5
index a97366002b8..b20a5e67273 100644
--- a/src/tests/keywords/md5
+++ b/src/tests/keywords/md5
@@ -1,10 +1,6 @@
 #
 # PRE: update if
 #
-update reply {
-	Filter-Id := "filter"
-}
-
 update {
        control:Cleartext-Password := 'hello'
        request:Tmp-String-0 := "This is a string\n"
@@ -58,3 +54,5 @@ if ("%{hmacmd5:&Tmp-String-1 &Tmp-String-2}" != '750c783e6ab0b503eaa86e310a5db73
 		Filter-Id += 'fail 6'
 	}
 }
+
+success
diff --git a/src/tests/keywords/module-failure-message b/src/tests/keywords/module-failure-message
index 51b1ef41462..11af86f768d 100644
--- a/src/tests/keywords/module-failure-message
+++ b/src/tests/keywords/module-failure-message
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 test
@@ -38,3 +37,5 @@ if ("%{request:Module-Failure-Message[4]}" != 'test: RDEBUG4 error message') {
 		Filter-Id += 'Fail 4'
 	}
 }
+
+success
diff --git a/src/tests/keywords/pad b/src/tests/keywords/pad
index 1d2ed90ab3a..344a2a59c23 100644
--- a/src/tests/keywords/pad
+++ b/src/tests/keywords/pad
@@ -56,7 +56,4 @@ if ("%{lpad:&Tmp-String-0 7 x}" != "xxxtest") {
 	return
 }
 
-update reply {
-	Filter-Id := "filter"
-}
-
+success
diff --git a/src/tests/keywords/pairs b/src/tests/keywords/pairs
index 381adeef0e8..8ba02d683f2 100644
--- a/src/tests/keywords/pairs
+++ b/src/tests/keywords/pairs
@@ -8,7 +8,6 @@ update {
        request:Tmp-Octets-0 := 0x000504030201
        request:Tmp-Integer-0 := 7331
        request:Tunnel-Private-Group-Id:5 = 127.0.0.1
-       reply:Filter-Id = 'filter'
 }
 
 if ("%{pairs:request:[*]}" != "User-Name = \"bob\", User-Password = \"hello\", Tmp-String-0 = \"This is a string\", Tmp-String-0 = \"This is another one\", Tmp-Octets-0 = 0x000504030201, Tmp-Integer-0 = 7331, Tunnel-Private-Group-Id:5 = \"127.0.0.1\"") {
@@ -40,3 +39,5 @@ if ("%{pairs:control:User-Name}" != '') {
 		Filter-Id += 'fail 5'
 	}
 }
+
+success
diff --git a/src/tests/keywords/pap b/src/tests/keywords/pap
index a347b7cf711..749268dd410 100644
--- a/src/tests/keywords/pap
+++ b/src/tests/keywords/pap
@@ -2,7 +2,6 @@
 # PRE: update if
 #
 update {
-	reply:Filter-Id := 'filter'
 	control: !* ANY
 	request:Tmp-String-0 := "5RNqNl8iYLbkCc7JhR8as4TtDDCX6otuuWtcja8rITUyx9zrnHSe9tTHGmKK"	# 60 byte salt
 }
@@ -144,3 +143,5 @@ update {
 update control {
 	Auth-Type := Accept
 }
+
+success
diff --git a/src/tests/keywords/pap-ssha2 b/src/tests/keywords/pap-ssha2
index a8c9c9bc7f1..80356b876da 100644
--- a/src/tests/keywords/pap-ssha2
+++ b/src/tests/keywords/pap-ssha2
@@ -13,7 +13,6 @@ if ('${feature.tls}' != 'yes') {
 }
 
 update {
-	reply:Filter-Id := 'filter'
 	control: !* ANY
 	request:Tmp-String-0 := "5RNqNl8iYLbkCc7JhR8as4TtDDCX6otuuWtcja8rITUyx9zrnHSe9tTHGmKK"	# 60 byte salt
 }
@@ -112,3 +111,5 @@ update {
 update control {
 	Auth-Type := Accept
 }
+
+success
diff --git a/src/tests/keywords/redundant b/src/tests/keywords/redundant
index 4a48fa63769..403ef3b73a2 100644
--- a/src/tests/keywords/redundant
+++ b/src/tests/keywords/redundant
@@ -24,9 +24,7 @@ redundant {
 	}
 
 	group {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 	}
 }
 
diff --git a/src/tests/keywords/redundant-load-balance b/src/tests/keywords/redundant-load-balance
index 836fdc4a679..616d850d8df 100644
--- a/src/tests/keywords/redundant-load-balance
+++ b/src/tests/keywords/redundant-load-balance
@@ -59,7 +59,5 @@ if (&Tmp-Integer-0 != "%{Tmp-Integer-1[#]}") {
 	}
 }
 else {
-	update reply {
-		Filter-Id := 'filter'
-	}
+	success
 }
diff --git a/src/tests/keywords/redundant-map-fail b/src/tests/keywords/redundant-map-fail
index 2f7e61c37af..fb24a75b660 100644
--- a/src/tests/keywords/redundant-map-fail
+++ b/src/tests/keywords/redundant-map-fail
@@ -6,9 +6,7 @@ redundant {
 }
 
 if (noop || (&Tmp-Integer-0 == 4294967295)) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 } else {
 	fail
 }
diff --git a/src/tests/keywords/redundant-redundant b/src/tests/keywords/redundant-redundant
index bb802708d2a..fa26e4a248e 100644
--- a/src/tests/keywords/redundant-redundant
+++ b/src/tests/keywords/redundant-redundant
@@ -75,6 +75,4 @@ if (&Tmp-Integer-5 != 1) {
 	return
 }
 
-update reply {
-	Filter-Id := "filter"
-}
\ No newline at end of file
+success
diff --git a/src/tests/keywords/regex-escape b/src/tests/keywords/regex-escape
index 4ab1e5b97e8..261575b6dbb 100644
--- a/src/tests/keywords/regex-escape
+++ b/src/tests/keywords/regex-escape
@@ -23,7 +23,5 @@ elsif (&Tmp-String-1 =~ /%{Tmp-String-0}/) {
 	}
 }
 else {
-	update reply {
-		Filter-Id := "filter"
-	}
-}
\ No newline at end of file
+	success
+}
diff --git a/src/tests/keywords/regex-lhs b/src/tests/keywords/regex-lhs
index 91b0b2078b5..5e2a1c0666d 100644
--- a/src/tests/keywords/regex-lhs
+++ b/src/tests/keywords/regex-lhs
@@ -21,7 +21,5 @@ elsif (&Tmp-String-1 !~ /\^foo\$bar/) {
 		Filter-Id := "fail 1"
 	}
 } else {
-	update reply {
-		Filter-Id := "filter"
-	}
-}
\ No newline at end of file
+	success
+}
diff --git a/src/tests/keywords/return b/src/tests/keywords/return
index 49779a515a1..823c7557289 100644
--- a/src/tests/keywords/return
+++ b/src/tests/keywords/return
@@ -6,9 +6,7 @@ update control {
 }
 
 if (User-Name == "bob") {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 
 	#
 	#  We need this because the "return" below
diff --git a/src/tests/keywords/return-section b/src/tests/keywords/return-section
index 21ecea1a006..5b867245f97 100644
--- a/src/tests/keywords/return-section
+++ b/src/tests/keywords/return-section
@@ -6,9 +6,7 @@ update control {
 }
 
 if (User-Name == "bob") {
-	update reply {
-		Filter-Id := "filter"
-	}
+	ok
 
 	#
 	#  We need this because the "return" below
diff --git a/src/tests/keywords/sha1 b/src/tests/keywords/sha1
index 0d577a94a98..7f2c3e07475 100644
--- a/src/tests/keywords/sha1
+++ b/src/tests/keywords/sha1
@@ -9,10 +9,6 @@ update {
        request:Tmp-String-2 := "Jefe"
 }
 
-update reply {
-	Filter-Id := 'filter'
-}
-
 #
 #  Put "This is a string" into a file and call "sha1sum" on it.
 #  You should get this string.
@@ -58,3 +54,5 @@ if ("%{hmacsha1:&Tmp-String-1 &Tmp-String-2}" != 'effcdf6ae5eb2fa2d27416d5f184df
 		Filter-Id += 'fail 6'
 	}
 }
+
+success
diff --git a/src/tests/keywords/sha2 b/src/tests/keywords/sha2
index 89c54f4c0d3..6e65f84e18c 100644
--- a/src/tests/keywords/sha2
+++ b/src/tests/keywords/sha2
@@ -9,10 +9,6 @@ update {
        request:Tmp-Octets-0 := 0x000504030201
 }
 
-update reply {
-	Filter-Id := 'filter'
-}
-
 #
 #  Put "This is a string" into a file and call "sha256sum" on it.
 #  You should get this string.
@@ -79,3 +75,5 @@ else {	# no OPENSSL.  Force the test to pass
 		Filter-Id := 'filter'
 	}
 }
+
+success
diff --git a/src/tests/keywords/smash b/src/tests/keywords/smash
index fd19d3fa93c..2776393942e 100644
--- a/src/tests/keywords/smash
+++ b/src/tests/keywords/smash
@@ -3,4 +3,6 @@
 #
 #  This gives the game away.
 #
-update { control:Cleartext-Password := 'hello', reply:Filter-Id := "filter" }
+update { control:Cleartext-Password := 'hello', request:Reply-Message := "foo" }
+
+success
diff --git a/src/tests/keywords/string b/src/tests/keywords/string
index bcf0fcffc10..8216b6e4863 100644
--- a/src/tests/keywords/string
+++ b/src/tests/keywords/string
@@ -13,7 +13,5 @@ update request {
 #  %{string:...} is explicitly not binary safe
 #
 if ("%{string:Tmp-String-0}" == "this") {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
diff --git a/src/tests/keywords/switch b/src/tests/keywords/switch
index f64aeaf5abe..9a7b93c727a 100644
--- a/src/tests/keywords/switch
+++ b/src/tests/keywords/switch
@@ -1,8 +1,6 @@
 switch &User-Name {
 	case "bob" {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 	}
 
 	case "doug" {
diff --git a/src/tests/keywords/switch-attr-cast b/src/tests/keywords/switch-attr-cast
index e271a18b3ae..7fc3b4474ad 100644
--- a/src/tests/keywords/switch-attr-cast
+++ b/src/tests/keywords/switch-attr-cast
@@ -20,9 +20,7 @@ switch &Service-Type {
        #  and then that compared to the input Service-Type
        #
        case &Filter-Id {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
        }
 
        case {
diff --git a/src/tests/keywords/switch-attr-cmp b/src/tests/keywords/switch-attr-cmp
index e28ded81078..3970bacb40e 100644
--- a/src/tests/keywords/switch-attr-cmp
+++ b/src/tests/keywords/switch-attr-cmp
@@ -10,9 +10,7 @@ update request {
 #
 switch &User-Name {
 	case &Tmp-String-0 {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 	}
 
 	case "bob" {
diff --git a/src/tests/keywords/switch-default b/src/tests/keywords/switch-default
index b35ad95089e..b5b5e3e71f8 100644
--- a/src/tests/keywords/switch-default
+++ b/src/tests/keywords/switch-default
@@ -14,9 +14,7 @@ switch &User-Name {
 	}
 
 	case {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/tests/keywords/switch-escape b/src/tests/keywords/switch-escape
index 50d9fdf7b49..ab24344ea44 100644
--- a/src/tests/keywords/switch-escape
+++ b/src/tests/keywords/switch-escape
@@ -4,9 +4,7 @@ update request {
 
 switch "%{tolower:%{request:Tmp-String-0}}" {
 	case 'foo' {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 	}
 
 	case '' {
diff --git a/src/tests/keywords/switch-nodefault b/src/tests/keywords/switch-nodefault
index 5fb94699bc1..5c89bc59524 100644
--- a/src/tests/keywords/switch-nodefault
+++ b/src/tests/keywords/switch-nodefault
@@ -16,7 +16,5 @@ if (&reply:Filter-Id) {
 	}
 }
 else {
-	update reply {
-		Filter-Id := "filter"
-	}
-}
\ No newline at end of file
+	success
+}
diff --git a/src/tests/keywords/switch-virtual b/src/tests/keywords/switch-virtual
index 659604d98c7..9e3af41188c 100644
--- a/src/tests/keywords/switch-virtual
+++ b/src/tests/keywords/switch-virtual
@@ -10,9 +10,7 @@ update control {
 #
 switch &Packet-Type {
 	case Access-Request {
-		update reply {
-			Filter-Id := "filter"
-		}
+		success
 	}
 
 	case {
@@ -20,4 +18,4 @@ switch &Packet-Type {
 			Filter-Id := "fail"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/tests/keywords/truncation b/src/tests/keywords/truncation
index 8217e3670f1..3f70dc0fa02 100644
--- a/src/tests/keywords/truncation
+++ b/src/tests/keywords/truncation
@@ -1,9 +1,5 @@
 # cat /dev/urandom | env LC_CTYPE=C tr -cd 'a-f0-9' | head -c <n>
 
-update reply {
-       Filter-Id := "filter"
-}
-
 # 8192 - 0x (2) - '' (2) there are unlikely to be any static buffers this big outside of the conffile parser
 update request {
 	Tmp-Octets-0 := '0x\
@@ -107,3 +103,4 @@ if ("%{length:Tmp-String-0}" != 8168) {
 }
 
 # We can't do any more until all the xlat code uses dynamically allocated buffers
+success
diff --git a/src/tests/keywords/unknown b/src/tests/keywords/unknown
index 61b7d8c4c87..356443fddf9 100644
--- a/src/tests/keywords/unknown
+++ b/src/tests/keywords/unknown
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-	Filter-Id := "filter"
-}
-
 update request {
 	FreeRADIUS-Proxied-To  := 127.0.0.2
 }
@@ -91,4 +87,6 @@ if (&Attr-26.66.1 != 0x01020304) {
 	update reply {
 		Filter-Id += 'Fail 9'
 	}
-}
\ No newline at end of file
+}
+
+success
diff --git a/src/tests/keywords/update b/src/tests/keywords/update
index 97a2557b683..afc589a6375 100644
--- a/src/tests/keywords/update
+++ b/src/tests/keywords/update
@@ -2,6 +2,4 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success
diff --git a/src/tests/keywords/update-add-ref-index b/src/tests/keywords/update-add-ref-index
index 7f5e74ad2f5..9a0b89fe3a1 100644
--- a/src/tests/keywords/update-add-ref-index
+++ b/src/tests/keywords/update-add-ref-index
@@ -3,7 +3,6 @@
 #
 
 update request {
-       reply:Filter-Id := "filter"
        Class := 0x01020304
        Class += 0x05060708
        Class += 0x090a0b0c
@@ -116,3 +115,5 @@ if (&Proxy-State[1]) {
 		Filter-Id += "fail 4b"
 	}
 }
+
+success
diff --git a/src/tests/keywords/update-add-ref-tag b/src/tests/keywords/update-add-ref-tag
index 39800b88511..cbe5214b33e 100644
--- a/src/tests/keywords/update-add-ref-tag
+++ b/src/tests/keywords/update-add-ref-tag
@@ -3,7 +3,6 @@
 #
 
 update request {
-	reply:Filter-Id := "filter"
 	request:Tunnel-Server-Endpoint += '192.0.1.1'
 	request:Tunnel-Server-Endpoint += '192.0.1.2'
 	request:Tunnel-Server-Endpoint:1 += '192.0.1.1'
@@ -116,3 +115,5 @@ if ((&control:Tunnel-Server-Endpoint[0] != '192.0.2.1') || \
 		Filter-Id := "fail 4"
 	}
 }
+
+success
diff --git a/src/tests/keywords/update-all b/src/tests/keywords/update-all
index 549a1223817..595c2257c3c 100644
--- a/src/tests/keywords/update-all
+++ b/src/tests/keywords/update-all
@@ -5,5 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
+
+success
diff --git a/src/tests/keywords/update-array b/src/tests/keywords/update-array
index c872f4e834f..2838fb1e4b4 100644
--- a/src/tests/keywords/update-array
+++ b/src/tests/keywords/update-array
@@ -52,12 +52,4 @@ if (&Proxy-State[3]) {
 	}
 }
 
-#
-#  The test passes only if no test above
-#  added a Filter-Id
-#
-if (!reply:Filter-Id) {
-	update reply {
-		Filter-Id := "filter"
-	}
-}
\ No newline at end of file
+success
diff --git a/src/tests/keywords/update-delete b/src/tests/keywords/update-delete
index a5c2d5a1771..e09196b221a 100644
--- a/src/tests/keywords/update-delete
+++ b/src/tests/keywords/update-delete
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -38,3 +37,5 @@ if ((Tmp-String-0 && (Tmp-String-0 == 'foobarbaz')) || \
 update request {
 	User-Password := 'hello'
 }
+
+success
diff --git a/src/tests/keywords/update-error b/src/tests/keywords/update-error
index 92e0ed24b30..119b2295420 100644
--- a/src/tests/keywords/update-error
+++ b/src/tests/keywords/update-error
@@ -5,5 +5,4 @@
 #
 update no-such-list {	# ERROR
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
diff --git a/src/tests/keywords/update-error-2 b/src/tests/keywords/update-error-2
index 1fe98f0301c..9d422ea461b 100644
--- a/src/tests/keywords/update-error-2
+++ b/src/tests/keywords/update-error-2
@@ -5,5 +5,4 @@
 #
 update {
        no-such-list:Cleartext-Password := 'hello'	# ERROR
-       reply:Filter-Id := "filter"
 }
diff --git a/src/tests/keywords/update-error-3 b/src/tests/keywords/update-error-3
index ffab73ae68f..359b46bd601 100644
--- a/src/tests/keywords/update-error-3
+++ b/src/tests/keywords/update-error-3
@@ -6,5 +6,4 @@
 #
 update {
        Service-Type := 'hello'	# ERROR
-       reply:Filter-Id := "filter"
 }
diff --git a/src/tests/keywords/update-exec b/src/tests/keywords/update-exec
index b9a0f733f67..335e79f6337 100644
--- a/src/tests/keywords/update-exec
+++ b/src/tests/keywords/update-exec
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-	Filter-Id := "filter"
-}
-
 #
 # Exec with script output to attribute
 #
@@ -92,3 +88,4 @@ if (Tmp-String-0) {
 	}
 }
 
+success
diff --git a/src/tests/keywords/update-filter b/src/tests/keywords/update-filter
index 5d7d7743fd9..6d0d69d4566 100644
--- a/src/tests/keywords/update-filter
+++ b/src/tests/keywords/update-filter
@@ -299,5 +299,6 @@ debug_request
 
 update control {
 	Auth-Type := Accept
-	reply:Filter-Id := 'filter'
 }
+
+success
diff --git a/src/tests/keywords/update-hex b/src/tests/keywords/update-hex
index adb4a5cf68f..ba8fd8df32a 100644
--- a/src/tests/keywords/update-hex
+++ b/src/tests/keywords/update-hex
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 update {
@@ -27,3 +26,5 @@ if (Tmp-String-0 != '0x626f62') {
 		Filter-Id += 'Fail 1'
 	}
 }
+
+success
diff --git a/src/tests/keywords/update-index b/src/tests/keywords/update-index
index 390aca76798..9395a13985c 100644
--- a/src/tests/keywords/update-index
+++ b/src/tests/keywords/update-index
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := "filter"
 }
 
 update {
@@ -50,3 +49,4 @@ if ("%{control:Reply-Message[#]}" != 3) {
 	}
 }
 
+success
diff --git a/src/tests/keywords/update-remove-any b/src/tests/keywords/update-remove-any
index e0ef600aae5..0f751c03fbe 100644
--- a/src/tests/keywords/update-remove-any
+++ b/src/tests/keywords/update-remove-any
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update {
@@ -48,3 +47,5 @@ if ((control:Tmp-IP-Address-0 != 192.0.2.1) || ("%{control:Tmp-IP-Address-0[1]}"
 		reply:Filter-Id += 'fail 4'
 	}
 }
+
+success
diff --git a/src/tests/keywords/update-remove-index b/src/tests/keywords/update-remove-index
index 58df9a5ba6f..5bd343d04e3 100644
--- a/src/tests/keywords/update-remove-index
+++ b/src/tests/keywords/update-remove-index
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update {
@@ -98,3 +97,5 @@ if ((Tmp-String-0 != 'foobarbaz') || (Tmp-Integer-0 != 123456789)) {
 		Filter-Id += 'fail 6'
 	}
 }
+
+success
diff --git a/src/tests/keywords/update-remove-list b/src/tests/keywords/update-remove-list
index 22ae5772527..21981957d91 100644
--- a/src/tests/keywords/update-remove-list
+++ b/src/tests/keywords/update-remove-list
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -38,3 +37,5 @@ if ((Tmp-String-0 && (Tmp-String-0 == 'foobarbaz')) || \
 update request {
 	User-Password := 'hello'
 }
+
+success
diff --git a/src/tests/keywords/update-remove-tag b/src/tests/keywords/update-remove-tag
index 3328789e1e1..7dd43480c9a 100644
--- a/src/tests/keywords/update-remove-tag
+++ b/src/tests/keywords/update-remove-tag
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update {
@@ -273,3 +272,4 @@ if (Tunnel-Server-Endpoint:3[2] != '192.0.3.3') {
 	}
 }
 
+success
diff --git a/src/tests/keywords/update-remove-value b/src/tests/keywords/update-remove-value
index 3fd1f94b1ce..55354d15267 100644
--- a/src/tests/keywords/update-remove-value
+++ b/src/tests/keywords/update-remove-value
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update {
@@ -114,3 +113,5 @@ if (("%{control:Tmp-IP-Address-0[0]}" != 192.0.2.1) || ("%{control:Tmp-IP-Addres
 		Filter-Id += 'fail 7'
 	}
 }
+
+success
diff --git a/src/tests/keywords/update-tag b/src/tests/keywords/update-tag
index de75640fdc5..05b0984d633 100644
--- a/src/tests/keywords/update-tag
+++ b/src/tests/keywords/update-tag
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -171,3 +170,5 @@ if (Tmp-String-1[9] != '192.0.2.1') {
 		reply:Filter-Id += 'fail 21'
 	}
 }
+
+success
diff --git a/src/tests/keywords/update-xlat b/src/tests/keywords/update-xlat
index 03a0f158836..054ee4718f6 100644
--- a/src/tests/keywords/update-xlat
+++ b/src/tests/keywords/update-xlat
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 
@@ -80,3 +79,5 @@ if (&Tmp-String-1 != 'hello2') {
 }
 
 } # XXX
+
+success
diff --git a/src/tests/keywords/urlquote b/src/tests/keywords/urlquote
index 35057d813de..e118c3ce197 100644
--- a/src/tests/keywords/urlquote
+++ b/src/tests/keywords/urlquote
@@ -9,7 +9,6 @@ update {
 	request:Tmp-String-3 := '%C2%B1%C2%A7%21%40%23%24%25%5E%26%2A%28%29%2B%3D%7B%5B%7D%5D%3A%3B%22%27%7C%5C%3C%2C%3E%3F%2F%60'
 
 	request:Tmp-String-4 := '%E2%84%A2%C5%93%C2%A5%C2%A4'
-	reply:Filter-ID := 'filter'
 }
 
 
@@ -48,3 +47,5 @@ if (<string>"%{urlunquote:%{request:Tmp-String-4}}" != &Tmp-String-2) {
 		Filter-Id += 'Fail 6'
 	}
 }
+
+success
diff --git a/src/tests/keywords/vendor_specific.raw b/src/tests/keywords/vendor_specific.raw
index 13d81dcd576..7b24bc72f62 100644
--- a/src/tests/keywords/vendor_specific.raw
+++ b/src/tests/keywords/vendor_specific.raw
@@ -18,7 +18,5 @@ elsif (&Attr-26 != 0x01020304) {
 	}
 }
 else {
-	update reply {
-		Filter-Id := "filter"
-	}
-}
\ No newline at end of file
+	success
+}
diff --git a/src/tests/keywords/virtual b/src/tests/keywords/virtual
index d6dbe32bb03..9576688cc72 100644
--- a/src/tests/keywords/virtual
+++ b/src/tests/keywords/virtual
@@ -6,7 +6,5 @@ update control {
 }
 
 if (request:Packet-Type == Access-Request) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
diff --git a/src/tests/keywords/virtual-exists b/src/tests/keywords/virtual-exists
index 7a8e8f30f04..d1417620d2e 100644
--- a/src/tests/keywords/virtual-exists
+++ b/src/tests/keywords/virtual-exists
@@ -6,7 +6,5 @@ update control {
 }
 
 if (&Client-Shortname) {
-	update reply {
-		Filter-Id := "filter"
-	}
+	success
 }
diff --git a/src/tests/keywords/virtual-load-balance b/src/tests/keywords/virtual-load-balance
index 256c2ff66db..2305fcde06c 100644
--- a/src/tests/keywords/virtual-load-balance
+++ b/src/tests/keywords/virtual-load-balance
@@ -9,6 +9,4 @@
 virtual_instantiate
 virtual_instantiate.post-auth
 
-update reply {
-	Filter-Id := 'filter'
-}
+success
diff --git a/src/tests/keywords/virtual_policy b/src/tests/keywords/virtual_policy
index 4ab00e274ae..72317a70057 100644
--- a/src/tests/keywords/virtual_policy
+++ b/src/tests/keywords/virtual_policy
@@ -10,6 +10,4 @@
 virtual_policy
 virtual_policy.post-auth
 
-update reply {
-	Filter-Id := 'filter'
-}
+success
diff --git a/src/tests/keywords/wimax b/src/tests/keywords/wimax
index f149da4e44b..5908f121743 100644
--- a/src/tests/keywords/wimax
+++ b/src/tests/keywords/wimax
@@ -24,8 +24,4 @@ if (WiMAX-PFDv2-Src-Assigned != 1) {
 	}
 }
 
-if (!reply:Filter-Id) {
-	update reply {
-		Filter-Id := "filter"
-	}
-}
\ No newline at end of file
+success
diff --git a/src/tests/keywords/with_dots b/src/tests/keywords/with_dots
index 4fc6b06fb56..e851267d1dc 100644
--- a/src/tests/keywords/with_dots
+++ b/src/tests/keywords/with_dots
@@ -14,6 +14,4 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success
diff --git a/src/tests/keywords/xlat-attr b/src/tests/keywords/xlat-attr
index d19495a2f64..4bc5b8f62c3 100644
--- a/src/tests/keywords/xlat-attr
+++ b/src/tests/keywords/xlat-attr
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -60,3 +59,5 @@ if ("%{vendor_num:&Reply-Message}" != 0) {
 		Filter-Id += 'Fail 8'
 	}
 }
+
+success
diff --git a/src/tests/keywords/xlat-attr-index b/src/tests/keywords/xlat-attr-index
index c967dd63b5f..d8789cd19c3 100644
--- a/src/tests/keywords/xlat-attr-index
+++ b/src/tests/keywords/xlat-attr-index
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -51,3 +50,5 @@ if (Tmp-Integer-0 != 2) {
 		reply:Filter-Id += 'fail 4'
 	}
 }
+
+success
diff --git a/src/tests/keywords/xlat-attr-tag b/src/tests/keywords/xlat-attr-tag
index 61422d64ffe..912aa980592 100644
--- a/src/tests/keywords/xlat-attr-tag
+++ b/src/tests/keywords/xlat-attr-tag
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -225,3 +224,5 @@ if (Tmp-String-0[10] != '192.0.2.1') {
 		reply:Filter-Id += 'fail 23'
 	}
 }
+
+success
diff --git a/src/tests/keywords/xlat-explode b/src/tests/keywords/xlat-explode
index ea727d93721..13160a10402 100644
--- a/src/tests/keywords/xlat-explode
+++ b/src/tests/keywords/xlat-explode
@@ -9,7 +9,6 @@ update {
 	control:User-Name += '|hello|goodbye'
 	control:User-Name += '|morning|night|1|'
 	control:Reply-Message := 'Can\'t touch this'
-	reply:Filter-Id = 'filter'
 }
 
 if ("%{explode:&Class |}" != 3) {
@@ -89,3 +88,4 @@ if (&control:Reply-Message != 'Can\'t touch this') {
 }
 
 debug_all
+success
diff --git a/src/tests/keywords/xlat-octets b/src/tests/keywords/xlat-octets
index ea9543c0594..f047f65a1e7 100644
--- a/src/tests/keywords/xlat-octets
+++ b/src/tests/keywords/xlat-octets
@@ -5,7 +5,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 #
@@ -34,3 +33,5 @@ if ("%{Tmp-Octets-0[*]}" != '0x0001020304050607,0x0706050403020100') {
 		reply:Filter-Id += 'fail 3'
 	}
 }
+
+success
diff --git a/src/tests/keywords/xlat-virtual-attr b/src/tests/keywords/xlat-virtual-attr
index 395b88904c5..053076338d7 100644
--- a/src/tests/keywords/xlat-virtual-attr
+++ b/src/tests/keywords/xlat-virtual-attr
@@ -2,10 +2,6 @@
 #  PRE: if
 #
 
-update reply {
-	Filter-Id := "filter"
-}
-
 if ("%{Client-Shortname}" != 'test') {
 	update reply {
 		Filter-Id += "fail 0"
@@ -123,3 +119,5 @@ if ("%{Virtual-Server[#]}" != 1) {
 		Filter-Id += "fail 16"
 	}
 }
+
+success
diff --git a/src/tests/keywords/xlat-xlat b/src/tests/keywords/xlat-xlat
index f85794d8377..d7626f7b094 100644
--- a/src/tests/keywords/xlat-xlat
+++ b/src/tests/keywords/xlat-xlat
@@ -3,7 +3,6 @@
 #
 update {
 	control:Cleartext-Password := 'hello'
-	reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -48,3 +47,5 @@ if ("%{xlat:&Tmp-String-1[%{Tmp-Integer-0[2]}]}" != 'bar') {
 		Filter-Id += "fail 4"
 	}
 }
+
+success