From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 29 Nov 2022 23:26:34 +0000 (-0500)
Subject: change  (foo != bar) to !(foo == bar)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed65ae731f25162f396efb2306a8db319a971f19;p=thirdparty%2Ffreeradius-server.git

change  (foo != bar) to !(foo == bar)

See previous commit for long explanation, and Perl script which
made the changes
---

diff --git a/src/tests/keywords/array b/src/tests/keywords/array
index e631fe4f2f8..3b29090d226 100644
--- a/src/tests/keywords/array
+++ b/src/tests/keywords/array
@@ -9,19 +9,19 @@
 	&Class = 0x090a0b0c,
 }
 
-if (%{Class[#]} != 3) {
+if (!(%{Class[#]} == 3)) {
 	test_fail
 }
 
-if (&Class[0] != 0x01020304) {
+if (!(&Class[0] == 0x01020304)) {
 	test_fail
 }
 
-if (&Class[1] != 0x05060708) {
+if (!(&Class[1] == 0x05060708)) {
 	test_fail
 }
 
-if (&Class[2] != 0x090a0b0c) {
+if (!(&Class[2] == 0x090a0b0c)) {
 	test_fail
 }
 
@@ -31,7 +31,7 @@ if (&Class[3]) {
 }
 
 # Last element of the array
-if (&Class[n] != 0x090a0b0c) {
+if (!(&Class[n] == 0x090a0b0c)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/attr-index b/src/tests/keywords/attr-index
index 31c9ce2bf20..5f6d437e26a 100644
--- a/src/tests/keywords/attr-index
+++ b/src/tests/keywords/attr-index
@@ -6,29 +6,29 @@
 
 &Tmp-String-0[1] := "yellow"
 
-if ("%{Tmp-String-0[*]}" != "fooyellowbaz") {
+if (!("%{Tmp-String-0[*]}" == "fooyellowbaz")) {
 	test_fail
 }
 
 &Tmp-String-0[2] += "red"
 
-if ("%{Tmp-String-0[*]}" != "fooyellowbazred") {
+if (!("%{Tmp-String-0[*]}" == "fooyellowbazred")) {
 	test_fail
 }
 
 &Tmp-String-0[2] -= "red"
 
-if ("%{Tmp-String-0[*]}" != "fooyellowbaz") {
+if (!("%{Tmp-String-0[*]}" == "fooyellowbaz")) {
 	test_fail
 }
 
 &Tmp-String-0[0] := "oof"
-if ("%{Tmp-String-0[*]}" != "oofyellowbaz") {
+if (!("%{Tmp-String-0[*]}" == "oofyellowbaz")) {
 	test_fail
 }
 
 &Tmp-String-0[1] := "bar"
-if ("%{Tmp-String-0[*]}" != "oofbarbaz") {
+if (!("%{Tmp-String-0[*]}" == "oofbarbaz")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/base64 b/src/tests/keywords/base64
index 696c26d31ac..c3346c34009 100644
--- a/src/tests/keywords/base64
+++ b/src/tests/keywords/base64
@@ -30,42 +30,42 @@ ok
 }
 
 # String - bin 0x39383730
-if (&Tmp-String-0[0] != 'OTg3MA==') {
+if (!(&Tmp-String-0[0] == 'OTg3MA==')) {
 	test_fail
 }
 
 # Octets - bin 0x39383731
-if (&Tmp-String-1[0] != 'OTg3MQ==') {
+if (!(&Tmp-String-1[0] == 'OTg3MQ==')) {
 	test_fail
 }
 
 # IP Address - bin 0x39383732
-if (&Tmp-String-2[0] != 'OTg3Mg==') {
+if (!(&Tmp-String-2[0] == 'OTg3Mg==')) {
 	test_fail
 }
 
 # Integer - bin 0x39383734
-if (&Tmp-String-4[0] != 'OTg3NA==') {
+if (!(&Tmp-String-4[0] == 'OTg3NA==')) {
 	test_fail
 }
 
 # ifid - bin 0x0000000039383737
-if (&Tmp-String-6[0] != 'AAAAADk4Nzc=') {
+if (!(&Tmp-String-6[0] == 'AAAAADk4Nzc=')) {
 	test_fail
 }
 
 # ipv6addr - bin 0x00000000000000000000000039383738
-if (&Tmp-String-7[0] != 'AAAAAAAAAAAAAAAAOTg3OA==') {
+if (!(&Tmp-String-7[0] == 'AAAAAAAAAAAAAAAAOTg3OA==')) {
 	test_fail
 }
 
 # ipv6addrprefix - bin 0x008000000000000000000000000039383739
-if (&Tmp-String-8[0] != 'AIAAAAAAAAAAAAAAAAA5ODc5') {
+if (!(&Tmp-String-8[0] == 'AIAAAAAAAAAAAAAAAAA5ODc5')) {
 	test_fail
 }
 
 # byte - bin 0x3a
-if (&Tmp-String-9[0] != 'Og==') {
+if (!(&Tmp-String-9[0] == 'Og==')) {
 	test_fail
 }
 
@@ -77,22 +77,22 @@ if (&Tmp-String-9[0] != 'Og==') {
 }
 
 # short - bin 0x373b
-if (&Tmp-String-0[0] != 'Nzs=') {
+if (!(&Tmp-String-0[0] == 'Nzs=')) {
 	test_fail
 }
 
 # ethernet - bin 0x00003938373c
-if (&Tmp-String-1[0] != 'AAA5ODc8') {
+if (!(&Tmp-String-1[0] == 'AAA5ODc8')) {
 	test_fail
 }
 
 # integer64 - bin 0x100000003938373d
-if (&Tmp-String-2[0] != 'EAAAADk4Nz0=') {
+if (!(&Tmp-String-2[0] == 'EAAAADk4Nz0=')) {
 	test_fail
 }
 
 # ipv4prefix - bin 0x203938373e
-if (&Tmp-String-3[0] != 'IDk4Nz4=') {
+if (!(&Tmp-String-3[0] == 'IDk4Nz4=')) {
 	test_fail
 }
 
@@ -101,11 +101,12 @@ if (&Tmp-String-3[0] != 'IDk4Nz4=') {
 	&Tmp-Octets-1		= "%{base64decode:AIAAAAAAAAAAAAAAAAA5ODc5}"
 }
 
-if (&Tmp-Octets-0 != "foo") {
+if (!(&Tmp-Octets-0 == "foo")) {
+	debug_request
 	test_fail
 }
 
-if (&Tmp-Octets-1 != 0x008000000000000000000000000039383739) {
+if (!(&Tmp-Octets-1 == 0x008000000000000000000000000039383739)) {
 	test_fail
 }
 
@@ -113,14 +114,14 @@ if (&Tmp-Octets-1 != 0x008000000000000000000000000039383739) {
 &request -= &Tmp-Octets-0[*]
 &Tmp-Octets-0 := %{base64decode:5RNqNl8iYLbkCc7JhR8as4TtDDCX6otuuWtcja8rITUyx9zrnHSe9tTHGmKK}
 
-if (&Tmp-Octets-0 != 0xe5136a365f2260b6e409cec9851f1ab384ed0c3097ea8b6eb96b5c8daf2b213532c7dceb9c749ef6d4c71a628a) {
+if (!(&Tmp-Octets-0 == 0xe5136a365f2260b6e409cec9851f1ab384ed0c3097ea8b6eb96b5c8daf2b213532c7dceb9c749ef6d4c71a628a)) {
 	test_fail
 }
 
 &request -= &Tmp-Octets-0[*]
 &Tmp-Octets-0 = "%{base64decode:eHfXPKZ+2iv9cnMV1MOmE/moYYA1Uk5xTmw4aVlMYmtDYzdKaFI4YXM0VHRERENYNm90dXVXdGNqYThySVRVeXg5enJuSFNlOXRUSEdtS0s=}"
 
-if (&Tmp-Octets-0 != 0x7877d73ca67eda2bfd727315d4c3a613f9a8618035524e714e6c3869594c626b4363374a685238617334547444444358366f7475755774636a6138724954557978397a726e48536539745448476d4b4b) {
+if (!(&Tmp-Octets-0 == 0x7877d73ca67eda2bfd727315d4c3a613f9a8618035524e714e6c3869594c626b4363374a685238617334547444444358366f7475755774636a6138724954557978397a726e48536539745448476d4b4b)) {
 	test_fail
 }
 success
diff --git a/src/tests/keywords/cmp-ipaddr b/src/tests/keywords/cmp-ipaddr
index 62731948f4a..f5ecb5ef09d 100644
--- a/src/tests/keywords/cmp-ipaddr
+++ b/src/tests/keywords/cmp-ipaddr
@@ -14,7 +14,7 @@ if (!(&NAS-IP-Address == &Framed-IP-Address)) {
 &NAS-IP-Address	:= 0.0.0.0
 &Framed-IP-Address := 255.255.255.255
 
-if (!(&NAS-IP-Address != &Framed-IP-Address)) {
+if (!(!(&NAS-IP-Address == &Framed-IP-Address))) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/comments b/src/tests/keywords/comments
index e45834ab78d..1475115755d 100644
--- a/src/tests/keywords/comments
+++ b/src/tests/keywords/comments
@@ -25,7 +25,7 @@ update { &Tmp-String-0 := 'candy' }	# Comment after unicorn block
 	&Reply-Message = "I am #literally a comment #"
 }
 
-if (&Tmp-String-0 != 'candy') {
+if (!(&Tmp-String-0 == 'candy')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/date b/src/tests/keywords/date
index a5e4f76c831..368060000e1 100644
--- a/src/tests/keywords/date
+++ b/src/tests/keywords/date
@@ -16,7 +16,7 @@ if (&Tmp-String-0 != "Fri 22 Sep 17:25:00 GMT 2017") && (&Tmp-String-0 != "Fri 2
 # Convert string to integer
 &Tmp-Integer-1 := %(integer:%(date:%{Tmp-String-0}))
 
-if (&Tmp-Integer-1 != &Tmp-Integer-0) {
+if (!(&Tmp-Integer-1 == &Tmp-Integer-0)) {
 	test_fail
 }
 
@@ -24,7 +24,7 @@ if (&Tmp-Integer-1 != &Tmp-Integer-0) {
 &Tmp-String-0 := %(localdate:request)
 &Tmp-String-1 := "%S"
 
-if (&Tmp-String-0 != &Tmp-String-1) {
+if (!(&Tmp-String-0 == &Tmp-String-1)) {
 	test_fail
 }
 
@@ -33,7 +33,7 @@ if (&Tmp-String-0 != &Tmp-String-1) {
 
 &Tmp-Integer-2 := %(integer:%(sqldate:%{Tmp-String-2}))
 
-if (&Tmp-Integer-2 != &Tmp-Integer-0) {
+if (!(&Tmp-Integer-2 == &Tmp-Integer-0)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/debug b/src/tests/keywords/debug
index 39d63e86f05..f0037a36faf 100644
--- a/src/tests/keywords/debug
+++ b/src/tests/keywords/debug
@@ -5,27 +5,27 @@
 &Tmp-Integer-0 := "%(debug:4)"
 
 # Check debug level is now 4
-if ("%(debug:3)" != 4) {
+if (!("%(debug:3)" == 4)) {
 	test_fail
 }
 
 # Call with NULL arg, should report current level
-if ("%(debug:%{Tmp-String-8})" != 3) {
+if (!("%(debug:%{Tmp-String-8})" == 3)) {
 	test_fail
 }
 
 # ...and again
-if ("%(debug:%{Tmp-String-8})" != 3) {
+if (!("%(debug:%{Tmp-String-8})" == 3)) {
 	test_fail
 }
 
 # ...and again
-if ("%(debug:)" != 3) {
+if (!("%(debug:)" == 3)) {
 	test_fail
 }
 
 # ...and again
-if ("%(debug:)" != 3) {
+if (!("%(debug:)" == 3)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit b/src/tests/keywords/edit
index cfebd211f62..f31bd8f751f 100644
--- a/src/tests/keywords/edit
+++ b/src/tests/keywords/edit
@@ -9,12 +9,12 @@
 #
 &Tmp-Integer-0 += 5
 
-if (&Tmp-Integer-0 != 9) {
+if (!(&Tmp-Integer-0 == 9)) {
 	test_fail
 }
 
 &Tmp-Integer-0 += &Tmp-Integer-1
-if (&Tmp-Integer-0 != 15) {
+if (!(&Tmp-Integer-0 == 15)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-group b/src/tests/keywords/edit-group
index 050001cf4c2..7323bfb097b 100644
--- a/src/tests/keywords/edit-group
+++ b/src/tests/keywords/edit-group
@@ -33,15 +33,15 @@ group {
 	&Tmp-String-2 := "bar"
 }
 
-if (&Tmp-String-0 != "foo") {
+if (!(&Tmp-String-0 == "foo")) {
 	test_fail
 }
 
-if (&Tmp-String-1 != "yup") {
+if (!(&Tmp-String-1 == "yup")) {
 	test_fail
 }
 
-if (&Tmp-String-2 != "bar") {
+if (!(&Tmp-String-2 == "bar")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-intersection b/src/tests/keywords/edit-intersection
index c64a2028b73..5fadc347561 100644
--- a/src/tests/keywords/edit-intersection
+++ b/src/tests/keywords/edit-intersection
@@ -13,7 +13,7 @@ if (!&reply.Tmp-String-0) {
 }
 
 # and have the correct value
-if (&reply.Tmp-String-0 != "foo") {
+if (!(&reply.Tmp-String-0 == "foo")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-leaf b/src/tests/keywords/edit-leaf
index 2a64d98af56..88485a18d20 100644
--- a/src/tests/keywords/edit-leaf
+++ b/src/tests/keywords/edit-leaf
@@ -6,11 +6,11 @@
 &Tmp-String-3 := { &Tmp-String-0, "bar", "%{Tmp-String-0}", %{Tmp-String-2} }
 
 
-if (%{Tmp-String-3[#]} != 4) {
+if (!(%{Tmp-String-3[#]} == 4)) {
 	test_fail
 }
 
-if ("%{Tmp-String-3[*]}" != "foobarfooTmp-String-0") {
+if (!("%{Tmp-String-3[*]}" == "foobarfooTmp-String-0")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-leaf-multivalue b/src/tests/keywords/edit-leaf-multivalue
index 617c05d8202..143c300d533 100644
--- a/src/tests/keywords/edit-leaf-multivalue
+++ b/src/tests/keywords/edit-leaf-multivalue
@@ -8,23 +8,23 @@
 	&User-Name
 }
 
-if (%{request.Tmp-String-0[#]} != 4) {
+if (!(%{request.Tmp-String-0[#]} == 4)) {
 	test_fail
 }
 
-if (&Tmp-String-0[0] != "foo") {
+if (!(&Tmp-String-0[0] == "foo")) {
 	test_fail
 }
 
-if (&Tmp-String-0[1] != "bar") {
+if (!(&Tmp-String-0[1] == "bar")) {
 	test_fail
 }
 
-if (&Tmp-String-0[2] != "baz") {
+if (!(&Tmp-String-0[2] == "baz")) {
 	test_fail
 }
 
-if (&Tmp-String-0[3] != "bob") {
+if (!(&Tmp-String-0[3] == "bob")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-leaf-octets b/src/tests/keywords/edit-leaf-octets
index deb4ae06720..e6b3d5704b4 100644
--- a/src/tests/keywords/edit-leaf-octets
+++ b/src/tests/keywords/edit-leaf-octets
@@ -8,7 +8,7 @@ if (!&Framed-IP-Address) {
 	test_fail
 }
 
-if (&Framed-IP-Address != 127.0.0.1) {
+if (!(&Framed-IP-Address == 127.0.0.1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-leaf-star b/src/tests/keywords/edit-leaf-star
index e4664c11daf..02824ede659 100644
--- a/src/tests/keywords/edit-leaf-star
+++ b/src/tests/keywords/edit-leaf-star
@@ -9,7 +9,7 @@
 #  Do operations on sets of inputs.
 #
 &Tmp-Integer-1 += &Tmp-Integer-0[*]
-if (&Tmp-Integer-1 != 27) {
+if (!(&Tmp-Integer-1 == 27)) {
 	test_fail
 }
 
@@ -24,7 +24,7 @@ if (&Tmp-Integer-1 != 27) {
 #  Do operations on sets of inputs.
 #
 &Tmp-Integer-1 += &Tmp-Integer-2[*]
-if (&Tmp-Integer-1 != 27) {
+if (!(&Tmp-Integer-1 == 27)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-list b/src/tests/keywords/edit-list
index 997b89c3011..3a499b93c05 100644
--- a/src/tests/keywords/edit-list
+++ b/src/tests/keywords/edit-list
@@ -36,7 +36,7 @@ if (!&Tmp-String-0[0]) {
 &control.Tmp-String-0 := { "a", "b", "c", "d" }
 
 &request += &control.Tmp-String-0[*]
-if (%{request.Tmp-String-0[#]} != 4) {
+if (!(%{request.Tmp-String-0[#]} == 4)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-list-remove b/src/tests/keywords/edit-list-remove
index e6d03d80482..710a9d4f220 100644
--- a/src/tests/keywords/edit-list-remove
+++ b/src/tests/keywords/edit-list-remove
@@ -46,7 +46,7 @@ if (!&Tmp-String-0) {
 &request -= &Tmp-String-0[0]
 
 #  the first one has been removed
-if (&Tmp-String-0[0] != "bar") {
+if (!(&Tmp-String-0[0] == "bar")) {
 	test_fail
 }
 
@@ -78,11 +78,11 @@ if (&Tmp-String-0) {
 	&Tmp-String-0 == "bar"
 }
 
-if (&Tmp-String-0[0] != "foo") {
+if (!(&Tmp-String-0[0] == "foo")) {
 	test_fail
 }
 
-if (&Tmp-String-0[1] != "baz") {
+if (!(&Tmp-String-0[1] == "baz")) {
 	test_fail
 }
 
@@ -94,7 +94,7 @@ if (&Tmp-String-0[2]) {
 #  Remove via in-place list, too.
 #
 &request -= "Tmp-String-0 == 'foo'"
-if (&Tmp-String-0[0] != "baz") {
+if (!(&Tmp-String-0[0] == "baz")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-list-star b/src/tests/keywords/edit-list-star
index 4b58fc1ef6c..3c90af0338a 100644
--- a/src/tests/keywords/edit-list-star
+++ b/src/tests/keywords/edit-list-star
@@ -8,7 +8,7 @@
 #  Do operations on sets of inputs.
 #
 &Tmp-Integer-1 += &Tmp-Group-0.Tmp-Integer-0[*]
-if (&Tmp-Integer-1 != 27) {
+if (!(&Tmp-Integer-1 == 27)) {
 	test_fail
 }
 
@@ -16,7 +16,7 @@ if (&Tmp-Integer-1 != 27) {
 &Tmp-Integer-1 := 0
 
 &Tmp-Integer-1 += &Tmp-Group-1.Tmp-Integer-0[*]
-if (&Tmp-Integer-1 != 27) {
+if (!(&Tmp-Integer-1 == 27)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-list-string b/src/tests/keywords/edit-list-string
index 36c2b40ce0f..6e5140a3725 100644
--- a/src/tests/keywords/edit-list-string
+++ b/src/tests/keywords/edit-list-string
@@ -10,7 +10,7 @@
 #
 &control += "Tmp-Integer-0 = 9"
 
-if (&control.Tmp-Integer-0 != 9) {
+if (!(&control.Tmp-Integer-0 == 9)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-nested b/src/tests/keywords/edit-nested
index ce70c4a9bc4..7e7ef40e44c 100644
--- a/src/tests/keywords/edit-nested
+++ b/src/tests/keywords/edit-nested
@@ -17,7 +17,7 @@ if (!&control.Tmp-Group-0.Tmp-Integer-0) {
 	test_fail
 }
 
-if (&control.Tmp-Group-0.Tmp-Integer-0 != 1) {
+if (!(&control.Tmp-Group-0.Tmp-Integer-0 == 1)) {
 	test_fail
 }
 
@@ -26,7 +26,7 @@ if (&control.Tmp-Group-0.Tmp-Integer-0 != 1) {
 #
 &control.Tmp-Group-0.Tmp-Integer-0 += 5
 
-if (&control.Tmp-Group-0.Tmp-Integer-0 != 6) {
+if (!(&control.Tmp-Group-0.Tmp-Integer-0 == 6)) {
 	test_fail
 }
 
@@ -52,7 +52,7 @@ if (&control.Tmp-Group-0.Tmp-Integer-0) {
 	&Tmp-IP-Address-0 = 127.0.0.1
 }
 
-if (&control.Tmp-Group-0.Tmp-IP-Address-0 != 127.0.0.1) {
+if (!(&control.Tmp-Group-0.Tmp-IP-Address-0 == 127.0.0.1)) {
 	test_fail
 }
 
@@ -63,11 +63,11 @@ if (&control.Tmp-Group-0.Tmp-IP-Address-0 != 127.0.0.1) {
 	&Tmp-Octets-0 = 0xabcdef
 }
 
-if (&control.Tmp-Group-0.Tmp-IP-Address-0 != 127.0.0.1) {
+if (!(&control.Tmp-Group-0.Tmp-IP-Address-0 == 127.0.0.1)) {
 	test_fail
 }
 
-if (&control.Tmp-Group-0.Tmp-Octets-0 != 0xabcdef) {
+if (!(&control.Tmp-Group-0.Tmp-Octets-0 == 0xabcdef)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-string b/src/tests/keywords/edit-string
index e93921b6765..fc666145230 100644
--- a/src/tests/keywords/edit-string
+++ b/src/tests/keywords/edit-string
@@ -4,14 +4,14 @@
 &Tmp-String-0 := "foo"
 &Tmp-String-0 ^= "bar"
 
-if (&Tmp-String-0 != "barfoo") {
+if (!(&Tmp-String-0 == "barfoo")) {
 	test_fail
 }
 
 &Tmp-String-0 := "foo"
 &Tmp-String-0 += "bar"
 
-if (&Tmp-String-0 != "foobar") {
+if (!(&Tmp-String-0 == "foobar")) {
 	test_fail
 }
 
@@ -20,7 +20,7 @@ if (&Tmp-String-0 != "foobar") {
 #
 &Tmp-String-0 -= "bar"
 
-if (&Tmp-String-0 != "foo") {
+if (!(&Tmp-String-0 == "foo")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-union b/src/tests/keywords/edit-union
index e2fc655c864..9f29053ebd2 100644
--- a/src/tests/keywords/edit-union
+++ b/src/tests/keywords/edit-union
@@ -19,12 +19,12 @@ if (!&Tmp-String-0) {
 }
 
 # The original value should be unchanged
-if (&Tmp-String-0[0] != "foo") {
+if (!(&Tmp-String-0[0] == "foo")) {
 	test_fail
 }
 
 #  and the new value should be there, too
-if (&Tmp-String-0[1] != "bar") {
+if (!(&Tmp-String-0[1] == "bar")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/escape b/src/tests/keywords/escape
index a18246e7e6c..8af127cd339 100644
--- a/src/tests/keywords/escape
+++ b/src/tests/keywords/escape
@@ -15,39 +15,39 @@
 # = not followed by hex and without 2 following chars
 &Tmp-String-8 := 'a=Az=y'
 
-if (<string>"%{escape:%{Tmp-String-0}}" != &Tmp-String-0) {
+if (!(<string>"%{escape:%{Tmp-String-0}}" == &Tmp-String-0)) {
 	test_fail
 }
 
-if (<string>"%{escape:%{Tmp-String-1}}" != &Tmp-String-3) {
+if (!(<string>"%{escape:%{Tmp-String-1}}" == &Tmp-String-3)) {
 	test_fail
 }
 
-if (<string>"%{escape:%{Tmp-String-2}}" != &Tmp-String-4) {
+if (!(<string>"%{escape:%{Tmp-String-2}}" == &Tmp-String-4)) {
 	test_fail
 }
 
-if (<string>"%{unescape:%{Tmp-String-0}}" != &Tmp-String-0) {
+if (!(<string>"%{unescape:%{Tmp-String-0}}" == &Tmp-String-0)) {
 	test_fail
 }
 
-if (<string>"%{unescape:%{Tmp-String-3}}" != "%{Tmp-String-1}") {
+if (!(<string>"%{unescape:%{Tmp-String-3}}" == "%{Tmp-String-1}")) {
 	test_fail
 }
 
-if (<string>"%{unescape:%{Tmp-String-4}}" != &Tmp-String-2) {
+if (!(<string>"%{unescape:%{Tmp-String-4}}" == &Tmp-String-2)) {
 	test_fail
 }
 
-if (<string>"%{escape:%{Tmp-String-6}}" != &Tmp-String-7) {
+if (!(<string>"%{escape:%{Tmp-String-6}}" == &Tmp-String-7)) {
 	test_fail
 }
 
-if (<string>"%{unescape:%{Tmp-String-7}}" != &Tmp-String-6) {
+if (!(<string>"%{unescape:%{Tmp-String-7}}" == &Tmp-String-6)) {
 	test_fail
 }
 
-if (<string>"%{unescape:%{Tmp-String-8}}" != &Tmp-String-8) {
+if (!(<string>"%{unescape:%{Tmp-String-8}}" == &Tmp-String-8)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/escape-sequences b/src/tests/keywords/escape-sequences
index d28fbc06747..a0378245d77 100644
--- a/src/tests/keywords/escape-sequences
+++ b/src/tests/keywords/escape-sequences
@@ -19,11 +19,11 @@
 }
 
 
-if ("%(length:%{Tmp-String-0})" != 39) {
+if (!("%(length:%{Tmp-String-0})" == 39)) {
 	test_fail
 }
 
-if ("%(length:%{Tmp-String-1})" != 42) {
+if (!("%(length:%{Tmp-String-1})" == 42)) {
 	test_fail
 }
 
@@ -37,7 +37,7 @@ if (&Tmp-String-0 != "i have scary embedded things\000 inside me") {
 }
 
 &Tmp-String-8 := "%{string:%{Tmp-Octets-1}}"
-if (&Tmp-String-8 != "0x01\0010x07\0070x0A\n0x0D\r\"\"0xb0\260°") {
+if (!(&Tmp-String-8 == "0x01\0010x07\0070x0A\n0x0D\r\"\"0xb0\260°")) {
 	test_fail
 }
 
@@ -45,7 +45,7 @@ if ("%{Tmp-String-0[0]}" != "i have scary embedded things\000 inside me") {
 	test_fail
 }
 
-if ("%{Tmp-String-0[1]}" != "0x01\0010x07\0070x0A\n0x0D\r\"\"0xb0\260°") {
+if (!("%{Tmp-String-0[1]}" == "0x01\0010x07\0070x0A\n0x0D\r\"\"0xb0\260°")) {
 	test_fail
 }
 
@@ -54,7 +54,7 @@ if ("%{Tmp-String-0[*]}" != "i have scary embedded things\000 inside me0x01\0010
 	test_fail
 }
 
-if (&Tmp-String-0[0] != &Tmp-String-0[0]) {
+if (!(&Tmp-String-0[0] == &Tmp-String-0[0])) {
 	test_fail
 }
 
@@ -62,14 +62,14 @@ if (&Tmp-String-0[0] != &Tmp-String-0[0]) {
 #  This seems weird... double escapes for most things, but single escapes
 #  for the quotation marks.
 #
-if ("%{Tmp-String-2[1]}" != "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°") {
+if (!("%{Tmp-String-2[1]}" == "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°")) {
 	test_fail
 }
 
 #
 # And again as an attribute reference
 #
-if (&Tmp-String-2[1] != "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°") {
+if (!(&Tmp-String-2[1] == "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°")) {
 	test_fail
 }
 
@@ -77,7 +77,7 @@ if (&Tmp-String-2[1] != "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°") {
 #  Other data types
 #
 &Tmp-String-0 := "%{string:&Tmp-IP-Address-0}"
-if ("%(length:%{Tmp-String-0})" != 17) {
+if (!("%(length:%{Tmp-String-0})" == 17)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/ethernet b/src/tests/keywords/ethernet
index 3585db11007..c09bbc716d6 100644
--- a/src/tests/keywords/ethernet
+++ b/src/tests/keywords/ethernet
@@ -4,11 +4,11 @@
 	&Tmp-Octets-0 = 0x001122334456,
 }
 
-if (&Tmp-Ethernet-0[0] != 00:11:22:33:44:54) {
+if (!(&Tmp-Ethernet-0[0] == 00:11:22:33:44:54)) {
 	test_fail
 }
 
-if (&Tmp-Ethernet-0[1] != 00:11:22:33:44:55) {
+if (!(&Tmp-Ethernet-0[1] == 00:11:22:33:44:55)) {
 	test_fail
 }
 
@@ -16,7 +16,7 @@ if (&Tmp-Ethernet-0[1] != 00:11:22:33:44:55) {
 	&Tmp-Ethernet-0 = &Tmp-Octets-0[0]
 }
 
-if (&Tmp-Ethernet-0[2] != 00:11:22:33:44:56) {
+if (!(&Tmp-Ethernet-0[2] == 00:11:22:33:44:56)) {
 	test_fail
 }
 
@@ -26,7 +26,7 @@ if (&Tmp-Ethernet-0[2] != 00:11:22:33:44:56) {
 	&Tmp-Ethernet-0 = %{Tmp-Ethernet-1[42]}
 }
 
-if (%{request.Tmp-Ethernet-0[#]} != 3) {
+if (!(%{request.Tmp-Ethernet-0[#]} == 3)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/foreach-isolation b/src/tests/keywords/foreach-isolation
index e39c1ed0c43..e065708ea63 100644
--- a/src/tests/keywords/foreach-isolation
+++ b/src/tests/keywords/foreach-isolation
@@ -17,7 +17,7 @@ if (!&Tmp-String-0[0] || !&Tmp-String-0[1] || !&Tmp-String-0[2] || !&Tmp-String-
 	test_fail
 }
 
-if ((&Tmp-String-0[0] != '0') || (&Tmp-String-0[1] != '1') || (&Tmp-String-0[2] != '2') || (&Tmp-String-0[3] != '3')) {
+if (!((&Tmp-String-0[0] == '0')) || (!(&Tmp-String-0[1] == '1')) || (&Tmp-String-0[2] != '2') || (&Tmp-String-0[3] != '3')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/foreach-varied-depth b/src/tests/keywords/foreach-varied-depth
index 25962d8500f..3e312c9a1bb 100644
--- a/src/tests/keywords/foreach-varied-depth
+++ b/src/tests/keywords/foreach-varied-depth
@@ -14,7 +14,7 @@ if (&User-Name) {
 	}
 }
 
-if (&control.Tmp-String-1 != 'ssid=GHIJKL') {
+if (!(&control.Tmp-String-1 == 'ssid=GHIJKL')) {
 	test_fail
 }
 
@@ -26,7 +26,7 @@ foreach &control.Tmp-String-0 {
 	}
 }
 
-if (&control.Tmp-String-1 != 'ssid=GHIJKL') {
+if (!(&control.Tmp-String-1 == 'ssid=GHIJKL')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/hex b/src/tests/keywords/hex
index 995afd0f0b5..406540985e7 100644
--- a/src/tests/keywords/hex
+++ b/src/tests/keywords/hex
@@ -28,42 +28,42 @@ ok  # break up edit sections
 }
 
 # String
-if (&Tmp-String-1[0] != '39383730') {
+if (!(&Tmp-String-1[0] == '39383730')) {
 	test_fail
 }
 
 # Octets
-if (&Tmp-String-1[1] != '39383731') {
+if (!(&Tmp-String-1[1] == '39383731')) {
 	test_fail
 }
 
 # IP Address
-if (&Tmp-String-1[2] != '39383732') {
+if (!(&Tmp-String-1[2] == '39383732')) {
 	test_fail
 }
 
 # Integer
-if (&Tmp-String-1[3] != '39383734') {
+if (!(&Tmp-String-1[3] == '39383734')) {
 	test_fail
 }
 
 # ifid
-if (&Tmp-String-1[4] != '0000000039383737') {
+if (!(&Tmp-String-1[4] == '0000000039383737')) {
 	test_fail
 }
 
 # ipv6addr
-if (&Tmp-String-1[5] != '00000000000000000000000039383738') {
+if (!(&Tmp-String-1[5] == '00000000000000000000000039383738')) {
 	test_fail
 }
 
 # ipv6addrprefix
-if (&Tmp-String-1[6] != '008000000000000000000000000039383739') {
+if (!(&Tmp-String-1[6] == '008000000000000000000000000039383739')) {
 	test_fail
 }
 
 # byte
-if (&Tmp-String-1[7] != '3a') {
+if (!(&Tmp-String-1[7] == '3a')) {
 	test_fail
 }
 
@@ -75,22 +75,22 @@ if (&Tmp-String-1[7] != '3a') {
 }
 
 # short
-if (&Tmp-String-1[0] != '373b') {
+if (!(&Tmp-String-1[0] == '373b')) {
 	test_fail
 }
 
 # ethernet
-if (&Tmp-String-1[1] != '00003938373c') {
+if (!(&Tmp-String-1[1] == '00003938373c')) {
 	test_fail
 }
 
 # integer64
-if (&Tmp-String-1[2] != '100000003938373d') {
+if (!(&Tmp-String-1[2] == '100000003938373d')) {
 	test_fail
 }
 
 # ipv4prefix
-if (&Tmp-String-1[3] != '203938373e') {
+if (!(&Tmp-String-1[3] == '203938373e')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/if-bob b/src/tests/keywords/if-bob
index 7bebd97e479..cf47999d5f0 100644
--- a/src/tests/keywords/if-bob
+++ b/src/tests/keywords/if-bob
@@ -6,6 +6,6 @@ if (&User-Name == "bob") {
 	success
 }
 
-if (&User-Name != "bob") {
+if (!(&User-Name == "bob")) {
 	test_fail
 }
diff --git a/src/tests/keywords/if-else b/src/tests/keywords/if-else
index 414ca6f46ab..9717280faf7 100644
--- a/src/tests/keywords/if-else
+++ b/src/tests/keywords/if-else
@@ -3,7 +3,7 @@
 #
 #  Matching "if" conditions
 #
-if (&User-Name != "bob") {
+if (!(&User-Name == "bob")) {
 	test_fail
 }
 else {
diff --git a/src/tests/keywords/if-elsif b/src/tests/keywords/if-elsif
index e082a52b966..76dfed61405 100644
--- a/src/tests/keywords/if-elsif
+++ b/src/tests/keywords/if-elsif
@@ -2,7 +2,7 @@
 #
 #  Matching "if" conditions
 #
-if (&User-Name != "bob") {
+if (!(&User-Name == "bob")) {
 	test_fail
 }
 elsif (&User-Name == "bob") {
diff --git a/src/tests/keywords/if-multivalue b/src/tests/keywords/if-multivalue
index f7311e00702..db3852f1308 100644
--- a/src/tests/keywords/if-multivalue
+++ b/src/tests/keywords/if-multivalue
@@ -47,7 +47,7 @@
 #
 #  Mmmm O(N^2)
 #
-if (&Tmp-String-0[*] != &control.Tmp-String-0[*]) {
+if (!(&Tmp-String-0[*] == &control.Tmp-String-0[*])) {
 	test_fail
 }
 
@@ -62,7 +62,7 @@ if (&Tmp-String-1[*] == &control.Tmp-String-0[*]) {
 #
 #  Integer comparison and normalisation
 #
-if (&Tmp-Integer-0 != &control.Tmp-Integer-0) {
+if (!(&Tmp-Integer-0 == &control.Tmp-Integer-0)) {
 	test_fail
 }
 
@@ -111,14 +111,14 @@ if (&Tmp-String-1 =~ /%{Tmp-String-2[#]}$/) {
 #
 #  XLAT virtual comparisons
 #
-if (&control.Tmp-Integer-0[*] != "%{control.Tmp-Integer-0[#]}") {
+if (!(&control.Tmp-Integer-0[*] == "%{control.Tmp-Integer-0[#]}")) {
 	test_fail
 }
 
 #
 #  Literal comparisons
 #
-if (&control.Tmp-String-1[*] != 'boink') {
+if (!(&control.Tmp-String-1[*] == 'boink')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/if-regex-empty b/src/tests/keywords/if-regex-empty
index 80c58f3e0a4..102a09514bb 100644
--- a/src/tests/keywords/if-regex-empty
+++ b/src/tests/keywords/if-regex-empty
@@ -42,7 +42,7 @@ if (!&control.Tmp-String-1) {
 	test_fail
 }
 
-if (&control.Tmp-String-1 != "") {
+if (!(&control.Tmp-String-1 == "")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/if-regex-match b/src/tests/keywords/if-regex-match
index e9c4336b090..ff135575d6c 100644
--- a/src/tests/keywords/if-regex-match
+++ b/src/tests/keywords/if-regex-match
@@ -23,7 +23,7 @@ else {
 
 # Checking capture groups are cleared out correctly
 if (&User-Name =~ /^([0-9])_%{Tmp-String-0}/) {
-	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1_1') {
+	if (!("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" == '1_1')) {
 		test_fail
 	}
 }
@@ -33,7 +33,7 @@ else {
 
 # Checking capture groups are cleared out correctly when there are no matches
 if (&User-Name =~ /^.%{Tmp-String-0}/) {
-	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1') {
+	if (!("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" == '1')) {
 		test_fail
 	}
 }
@@ -43,7 +43,7 @@ else {
 
 # Checking full capture group range
 if ('a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_F' =~ /^(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)$/) {
-	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}%{8}%{9}%{10}%{11}%{12}%{13}%{14}%{15}%{16}%{17}%{18}%{19}%{20}%{21}%{22}%{23}%{24}%{25}%{26}%{27}%{28}%{29}%{30}%{31}%{32}" != 'a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_FabcdefghijklmnopqrstuvwxyzABCDEF') {
+	if (!("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}%{8}%{9}%{10}%{11}%{12}%{13}%{14}%{15}%{16}%{17}%{18}%{19}%{20}%{21}%{22}%{23}%{24}%{25}%{26}%{27}%{28}%{29}%{30}%{31}%{32}" == 'a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_FabcdefghijklmnopqrstuvwxyzABCDEF')) {
 		test_fail
 	}
 }
@@ -53,7 +53,7 @@ else {
 
 # Checking full capture group overun
 if ('a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_F_G' =~ /^(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)$/) {
-	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}%{8}%{9}%{10}%{11}%{12}%{13}%{14}%{15}%{16}%{17}%{18}%{19}%{20}%{21}%{22}%{23}%{24}%{25}%{26}%{27}%{28}%{29}%{30}%{31}%{32}" != 'a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_F_GabcdefghijklmnopqrstuvwxyzABCDEF') {
+	if (!("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}%{8}%{9}%{10}%{11}%{12}%{13}%{14}%{15}%{16}%{17}%{18}%{19}%{20}%{21}%{22}%{23}%{24}%{25}%{26}%{27}%{28}%{29}%{30}%{31}%{32}" == 'a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_F_GabcdefghijklmnopqrstuvwxyzABCDEF')) {
 		test_fail
 	}
 }
diff --git a/src/tests/keywords/if-regex-match-comp b/src/tests/keywords/if-regex-match-comp
index 8f1f64585a3..4c147242d93 100644
--- a/src/tests/keywords/if-regex-match-comp
+++ b/src/tests/keywords/if-regex-match-comp
@@ -22,7 +22,7 @@ else {
 
 # Checking capture groups are cleared out correctly
 if (&User-Name =~ /^([0-9])_/) {
-	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1_1') {
+	if (!("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" == '1_1')) {
 		test_fail
 	}
 }
@@ -32,7 +32,7 @@ else {
 
 # Checking capture groups are cleared out correctly when there are no matches
 if (&User-Name =~ /^./) {
-	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1') {
+	if (!("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" == '1')) {
 		test_fail
 	}
 }
diff --git a/src/tests/keywords/if-regex-match-named b/src/tests/keywords/if-regex-match-named
index b270633d396..9adb9a6594f 100644
--- a/src/tests/keywords/if-regex-match-named
+++ b/src/tests/keywords/if-regex-match-named
@@ -42,7 +42,7 @@ if (&Module-Failure-Message != "No previous numbered regex capture group") {
 # uncompiled - ref - named capture groups
 if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])%{Tmp-String-1}/) {
 	&Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}"
-	if (&Tmp-String-0 != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
+	if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) {
 		test_fail
 	}
 }
@@ -53,7 +53,7 @@ else {
 # Checking capture groups are cleared out correctly
 if (&User-Name =~ /^(?<one>[0-9])_%{Tmp-String-1}/) {
 	&Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}"
-	if (&Tmp-String-0 != '1_1') {
+	if (!(&Tmp-String-0 == '1_1')) {
 		test_fail
 	}
 }
@@ -64,7 +64,7 @@ else {
 # Checking capture groups are cleared out correctly when there are no matches
 if (&User-Name =~ /^.%{Tmp-String-1}/) {
 	&Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}"
-	if (&Tmp-String-0 != '1') {
+	if (!(&Tmp-String-0 == '1')) {
 		test_fail
 	}
 }
@@ -75,7 +75,7 @@ else {
 # compiled - ref - named capture groups
 if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
 	&Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}"
-	if (&Tmp-String-0 != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
+	if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) {
 		test_fail
 	}
 }
@@ -86,7 +86,7 @@ else {
 # compiled - xlat - named capture groups
 if ('1_2_3_4_5_6_7' =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
 	&Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}"
-	if (&Tmp-String-0 != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
+	if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) {
 		test_fail
 	}
 }
@@ -97,7 +97,7 @@ else {
 # compiled - ref - named capture groups (numeric indexes)
 if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
 	&Tmp-String-0 := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
-	if (&Tmp-String-0 != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
+	if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) {
 		test_fail
 	}
 
@@ -118,7 +118,7 @@ if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+
 	&Tmp-Integer-7 := 7
 
 	&Tmp-String-0 := "%{regex:%{Tmp-Integer-7}}_%{regex:%{Tmp-Integer-6}}_%{regex:%{Tmp-Integer-5}}_%{regex:%{Tmp-Integer-4}}_%{regex:%{Tmp-Integer-3}}_%{regex:%{Tmp-Integer-2}}_%{regex:%{Tmp-Integer-1}}_%{regex:%{Tmp-Integer-0}}"
-	if (&Tmp-String-0 != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
+	if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) {
 		test_fail
 	}
 }
diff --git a/src/tests/keywords/if-regex-multivalue b/src/tests/keywords/if-regex-multivalue
index 3a08820b274..75525fd51be 100644
--- a/src/tests/keywords/if-regex-multivalue
+++ b/src/tests/keywords/if-regex-multivalue
@@ -9,7 +9,7 @@ update request {
 }
 
 if (&Vendor-Specific.Cisco.AVPair[1] =~ /bar=(.*)/) {
-	if ("%{1}" != 'baz') {
+	if (!("%{1}" == 'baz')) {
 		test_fail
 	}
 }
@@ -18,7 +18,7 @@ else {
 }
 
 if (&Vendor-Specific.Cisco.AVPair[*] =~ /bar=(.*)/) {
-	if ("%{1}" != 'baz') {
+	if (!("%{1}" == 'baz')) {
 		test_fail
 	}
 }
diff --git a/src/tests/keywords/ipaddr b/src/tests/keywords/ipaddr
index 697676d9795..4cb7a10a102 100644
--- a/src/tests/keywords/ipaddr
+++ b/src/tests/keywords/ipaddr
@@ -16,23 +16,23 @@
 	&Tmp-IP-Address-3 = 2130706436
 }
 
-if (&NAS-IP-Address != 127.0.0.1) {
+if (!(&NAS-IP-Address == 127.0.0.1)) {
 	test_fail
 }
 
-if (&Tmp-IP-Address-0 != 127.0.0.1) {
+if (!(&Tmp-IP-Address-0 == 127.0.0.1)) {
 	test_fail
 }
 
-if (&Tmp-IP-Address-1 != 127.0.0.2) {
+if (!(&Tmp-IP-Address-1 == 127.0.0.2)) {
 	test_fail
 }
 
-if (&Tmp-IP-Address-2 != 127.0.0.3) {
+if (!(&Tmp-IP-Address-2 == 127.0.0.3)) {
 	test_fail
 }
 
-if (&Tmp-IP-Address-3 != 127.0.0.4) {
+if (!(&Tmp-IP-Address-3 == 127.0.0.4)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/ipaddr.raw b/src/tests/keywords/ipaddr.raw
index b732bdbe2b4..e2c03725300 100644
--- a/src/tests/keywords/ipaddr.raw
+++ b/src/tests/keywords/ipaddr.raw
@@ -10,7 +10,7 @@
 if (!&raw.4) {
 	test_fail
 }
-elsif (&raw.4 != 0x010203) {
+elsif (!(&raw.4 == 0x010203)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/ipprefix b/src/tests/keywords/ipprefix
index df5c34e38fd..402ee6e2a03 100644
--- a/src/tests/keywords/ipprefix
+++ b/src/tests/keywords/ipprefix
@@ -7,19 +7,19 @@
 	&Framed-IP-Address = 198.51.0.1
 }
 
-if (&control.Tmp-Cast-IPv6Prefix != '::198.51.0.0/112') {
+if (!(&control.Tmp-Cast-IPv6Prefix == '::198.51.0.0/112')) {
 	test_fail
 }
 
-if (&control.Tmp-Cast-IPv4Prefix != '198.51.0.0/16') {
+if (!(&control.Tmp-Cast-IPv4Prefix == '198.51.0.0/16')) {
 	test_fail
 }
 
-if (&control.Tmp-Cast-IPv6Prefix != ::198.51.0.0/112) {
+if (!(&control.Tmp-Cast-IPv6Prefix == ::198.51.0.0/112)) {
 	test_fail
 }
 
-if (&control.Tmp-Cast-IPv4Prefix != 198.51.0.0/16) {
+if (!(&control.Tmp-Cast-IPv4Prefix == 198.51.0.0/16)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/length b/src/tests/keywords/length
index dff5a1f60e8..5f911f32593 100644
--- a/src/tests/keywords/length
+++ b/src/tests/keywords/length
@@ -20,7 +20,7 @@ abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
 	&Tmp-Cast-IPv4Prefix = 57.56.55.62/32
 }
 
-if (%(length:%{Tmp-String-0}) != 260) {
+if (!(%(length:%{Tmp-String-0}) == 260)) {
 	test_fail
 }
 
@@ -37,47 +37,47 @@ if (%(length:%{Tmp-String-0}) != 260) {
 }
 
 # String - bin 0x39383730
-if (&Tmp-uint64-0 != 4) {
+if (!(&Tmp-uint64-0 == 4)) {
 	test_fail
 }
 
 # Octets - bin 0x39383731
-if (&Tmp-Integer-1 != 4) {
+if (!(&Tmp-Integer-1 == 4)) {
 	test_fail
 }
 
 # IP Address - bin 0x39383732
-if (&Tmp-Integer-2 != 4) {
+if (!(&Tmp-Integer-2 == 4)) {
 	test_fail
 }
 
 # String - "hello, world"
-if (&Tmp-Integer-3 != 12) {
+if (!(&Tmp-Integer-3 == 12)) {
 	test_fail
 }
 
 # Integer - bin 0x39383734
-if (&Tmp-Integer-4 != 4) {
+if (!(&Tmp-Integer-4 == 4)) {
 	test_fail
 }
 
 # ifid - bin 0x0000000039383737
-if (&Tmp-Integer-6 != 8) {
+if (!(&Tmp-Integer-6 == 8)) {
 	test_fail
 }
 
 # ipv6addr - bin 0x00000000000000000000000039383738
-if (&Tmp-Integer-7 != 16) {
+if (!(&Tmp-Integer-7 == 16)) {
 	test_fail
 }
 
 # ipv6addrprefix - bin 0x8000000000000000000000000039383739
-if (&Tmp-Integer-8 != 17) {
+if (!(&Tmp-Integer-8 == 17)) {
 	test_fail
 }
 
 # byte - bin 0x3a
-if (&Tmp-Integer-9 != 1) {
+if (!(&Tmp-Integer-9 == 1)) {
 	test_fail
 }
 
@@ -87,22 +87,22 @@ if (&Tmp-Integer-9 != 1) {
 &Tmp-Integer-3	:= "%(length:%{Tmp-Cast-IPv4Prefix})"
 
 # short - bin 0x373b
-if (&Tmp-Integer-0 != 2) {
+if (!(&Tmp-Integer-0 == 2)) {
 	test_fail
 }
 
 # ethernet - bin 0x00003938373c
-if (&Tmp-Integer-1 != 6) {
+if (!(&Tmp-Integer-1 == 6)) {
 	test_fail
 }
 
 # integer64 - bin 0x100000003938373d
-if (&Tmp-Integer-2 != 8) {
+if (!(&Tmp-Integer-2 == 8)) {
 	test_fail
 }
 
 # ipv4prefix - bin 0x203938373e
-if (&Tmp-Integer-3 != 5) {
+if (!(&Tmp-Integer-3 == 5)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/map-csv-prepend b/src/tests/keywords/map-csv-prepend
index b83755737e8..34d41a5e742 100644
--- a/src/tests/keywords/map-csv-prepend
+++ b/src/tests/keywords/map-csv-prepend
@@ -8,15 +8,15 @@ map csv &User-Name {
 	&control.Tmp-String-0 ^= 'field3'
 }
 
-if ("%{control.Tmp-String-0[0]}" != 'success') {
+if (!("%{control.Tmp-String-0[0]}" == 'success')) {
 	test_fail
 }
 
-if ("%{control.Tmp-String-0[1]}" != "fail") {
+if (!("%{control.Tmp-String-0[1]}" == "fail")) {
 	test_fail
 }
 
-if ("%{control.Tmp-String-0[#]}" != 2) {
+if (!("%{control.Tmp-String-0[#]}" == 2)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat
index 126db42f325..eb02eee7d41 100644
--- a/src/tests/keywords/map-xlat
+++ b/src/tests/keywords/map-xlat
@@ -9,25 +9,25 @@
 	&Tmp-String-1 = "request.Vendor-Specific.Nokia-SR.MSAP-Interface += 'UNICAST_7360OLT4'"
 }
 
-if ("%{map:%{Tmp-String-0}}" != 1) {
+if (!("%{map:%{Tmp-String-0}}" == 1)) {
 	test_fail
 }
 
-if (&control.Tmp-String-0 != 'testing123') {
+if (!(&control.Tmp-String-0 == 'testing123')) {
 	test_fail
 }
 
 foreach &Tmp-String-1[*] {
-	if ("%{map:%{Foreach-Variable-0}}" != 1) {
+	if (!("%{map:%{Foreach-Variable-0}}" == 1)) {
 		test_fail
 	}
 }
 
-if (&Vendor-Specific.Nokia-SR.MSAP-Interface[0] != 'UNICAST_7360OLT3') {
+if (!(&Vendor-Specific.Nokia-SR.MSAP-Interface[0] == 'UNICAST_7360OLT3')) {
 	test_fail
 }
 
-if (&Vendor-Specific.Nokia-SR.MSAP-Interface[1] != 'UNICAST_7360OLT4') {
+if (!(&Vendor-Specific.Nokia-SR.MSAP-Interface[1] == 'UNICAST_7360OLT4')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/map-xlat-nested b/src/tests/keywords/map-xlat-nested
index e2f4242601d..01e51856d87 100644
--- a/src/tests/keywords/map-xlat-nested
+++ b/src/tests/keywords/map-xlat-nested
@@ -5,7 +5,7 @@
 #
 &Tmp-String-0 := "request.Tmp-Group-0.Tmp-String-1 = 'testing123'"
 
-if ("%{map:%{Tmp-String-0}}" != 1) {
+if (!("%{map:%{Tmp-String-0}}" == 1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/map-xlat-nested-overwrite b/src/tests/keywords/map-xlat-nested-overwrite
index 9d23ad17f14..865078fb521 100644
--- a/src/tests/keywords/map-xlat-nested-overwrite
+++ b/src/tests/keywords/map-xlat-nested-overwrite
@@ -5,11 +5,11 @@
 #
 &Tmp-String-0 := "request.Tmp-Group-0.Tmp-String-0 := 'testing123'"
 
-if ("%{map:%{Tmp-String-0}}" != 1) {
+if (!("%{map:%{Tmp-String-0}}" == 1)) {
 	test_fail
 }
 
-if ("%{map:%{Tmp-String-0}}" != 1) {
+if (!("%{map:%{Tmp-String-0}}" == 1)) {
 	test_fail
 }
 
@@ -17,11 +17,11 @@ if ("%{map:request.Tmp-Group-0.Tmp-String-1 := 'testing000'}" != 1) {
 	test_fail
 }
 
-if (!&Tmp-Group-0[0].Tmp-String-0 || (&Tmp-Group-0[0].Tmp-String-0 != 'testing123')) {
+if (!&Tmp-Group-0[0].Tmp-String-0 || (!(&Tmp-Group-0[0].Tmp-String-0 == 'testing123'))) {
 	test_fail
 }
 
-if (!&Tmp-Group-0[0].Tmp-String-1 || (&Tmp-Group-0[0].Tmp-String-1 != 'testing000')) {
+if (!&Tmp-Group-0[0].Tmp-String-1 || (!(&Tmp-Group-0[0].Tmp-String-1 == 'testing000'))) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/map-xlat-struct b/src/tests/keywords/map-xlat-struct
index 664f3781cb3..f2725470a22 100644
--- a/src/tests/keywords/map-xlat-struct
+++ b/src/tests/keywords/map-xlat-struct
@@ -6,7 +6,7 @@
 #
 &Tmp-String-0 := "IA-PD.IAID = 11"
 
-if ("%{map:%{Tmp-String-0}}" != 1) {
+if (!("%{map:%{Tmp-String-0}}" == 1)) {
 	test_fail
 }
 
@@ -14,7 +14,7 @@ if (!&IA-PD.IAID) {
 	test_fail
 }
 
-if (&IA-PD.IAID != 11) {
+if (!(&IA-PD.IAID == 11)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/md4 b/src/tests/keywords/md4
index 30636ab3341..4f918e04bee 100644
--- a/src/tests/keywords/md4
+++ b/src/tests/keywords/md4
@@ -22,29 +22,29 @@
 #  Put "This is a string" into a file and call "md4sum" on it.
 #  You should get this string.
 #
-if (&Tmp-Octets-1 != 0x1f60d5cd85e17bfbdda7c923822f060c) {
+if (!(&Tmp-Octets-1 == 0x1f60d5cd85e17bfbdda7c923822f060c)) {
 	test_fail
 }
 
-if (&Tmp-Octets-2 != 0x1f60d5cd85e17bfbdda7c923822f060c) {
+if (!(&Tmp-Octets-2 == 0x1f60d5cd85e17bfbdda7c923822f060c)) {
 	test_fail
 }
 
-if (&Tmp-Octets-3 != 0x1f60d5cd85e17bfbdda7c923822f060c) {
+if (!(&Tmp-Octets-3 == 0x1f60d5cd85e17bfbdda7c923822f060c)) {
 	test_fail
 }
 
 #
 #  MD5 should also be able to cope with references to octet attributes
 #
-if (&Tmp-Octets-4 != 0xac3ed17b3cf19ec38352ec534a932fc6) {
+if (!(&Tmp-Octets-4 == 0xac3ed17b3cf19ec38352ec534a932fc6)) {
 	test_fail
 }
 
 #
 #  MD5 of null string is d41d8cd98f00b204e9800998ecf8427e
 #
-if (&Tmp-Octets-5 != 0x31d6cfe0d16ae931b73c59d7e0c089c0) {
+if (!(&Tmp-Octets-5 == 0x31d6cfe0d16ae931b73c59d7e0c089c0)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/md5 b/src/tests/keywords/md5
index 72ef0a6c0d8..38284b842ec 100644
--- a/src/tests/keywords/md5
+++ b/src/tests/keywords/md5
@@ -24,43 +24,43 @@
 #  Put "This is a string" into a file and call "md5sum" on it.
 #  You should get this string.
 #
-if (&Tmp-Octets-1 != 0x9ac4dbbc3c0ad2429e61d0df5dc28add) {
+if (!(&Tmp-Octets-1 == 0x9ac4dbbc3c0ad2429e61d0df5dc28add)) {
 	test_fail
 }
 
-if (&Tmp-Octets-2 != 0x9ac4dbbc3c0ad2429e61d0df5dc28add) {
+if (!(&Tmp-Octets-2 == 0x9ac4dbbc3c0ad2429e61d0df5dc28add)) {
 	test_fail
 }
 
-if (&Tmp-Octets-3 != 0x9ac4dbbc3c0ad2429e61d0df5dc28add) {
+if (!(&Tmp-Octets-3 == 0x9ac4dbbc3c0ad2429e61d0df5dc28add)) {
 	test_fail
 }
 
 #
 #  MD5 should also be able to cope with references to octet attributes
 #
-if (&Tmp-Octets-4 != 0xc1e7fa505b2fc1fd0da6cac3db6f6f44) {
+if (!(&Tmp-Octets-4 == 0xc1e7fa505b2fc1fd0da6cac3db6f6f44)) {
 	test_fail
 }
 
 #
 #  MD5 of null string is d41d8cd98f00b204e9800998ecf8427e
 #
-if (&Tmp-Octets-5 != 0xd41d8cd98f00b204e9800998ecf8427e) {
+if (!(&Tmp-Octets-5 == 0xd41d8cd98f00b204e9800998ecf8427e)) {
 	test_fail
 }
 
 #
 #  MD5 HMAC with attribute references
 #
-if (&Tmp-Octets-6 != 0x750c783e6ab0b503eaa86e310a5db738) {
+if (!(&Tmp-Octets-6 == 0x750c783e6ab0b503eaa86e310a5db738)) {
 	test_fail
 }
 
 #
 #  MD5 HMAC with empty key and data
 #
-if (&Tmp-Octets-7 != 0x74e6f7298a9c2d168935f58c001bad88) {
+if (!(&Tmp-Octets-7 == 0x74e6f7298a9c2d168935f58c001bad88)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/pack b/src/tests/keywords/pack
index 6b075b575ec..6708afa110e 100644
--- a/src/tests/keywords/pack
+++ b/src/tests/keywords/pack
@@ -10,7 +10,7 @@
 
 &Tmp-Octets-0 := "%{pack:%{Framed-IP-Address}%{NAS-Port}%{NAS-IP-Address}}"
 
-if (&Tmp-Octets-0 != 0x7f000001000008407f000002) {
+if (!(&Tmp-Octets-0 == 0x7f000001000008407f000002)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/pairs b/src/tests/keywords/pairs
index bd77d944f3d..479ab5ed4a5 100644
--- a/src/tests/keywords/pairs
+++ b/src/tests/keywords/pairs
@@ -34,7 +34,7 @@ if (&Tmp-String-4 != "Password.Cleartext = \"hello\"") {
 	test_fail
 }
 
-if (&Tmp-String-5 != '') {
+if (!(&Tmp-String-5 == '')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/parallel b/src/tests/keywords/parallel
index c9cfd35259c..ceecf2698dc 100644
--- a/src/tests/keywords/parallel
+++ b/src/tests/keywords/parallel
@@ -21,7 +21,7 @@ parallel {
 	}
 }
 
-if ("%{control.Tmp-Integer-0[#]}" != 4) {
+if (!("%{control.Tmp-Integer-0[#]}" == 4)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/parallel-rcode b/src/tests/keywords/parallel-rcode
index c0ad6e8982e..bdba288db1f 100644
--- a/src/tests/keywords/parallel-rcode
+++ b/src/tests/keywords/parallel-rcode
@@ -61,7 +61,7 @@ group {
 if (!fail) {
 	test_fail
 }
-if (&Tmp-String-0 != 'foo') {
+if (!(&Tmp-String-0 == 'foo')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/parallel-yield b/src/tests/keywords/parallel-yield
index 2425cb10f65..8fa9bacf21b 100644
--- a/src/tests/keywords/parallel-yield
+++ b/src/tests/keywords/parallel-yield
@@ -10,7 +10,7 @@ parallel {
 	}
 }
 
-if (&Tmp-String-0 != 'foo') {
+if (!(&Tmp-String-0 == 'foo')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/randstr b/src/tests/keywords/randstr
index 24b50ac0a61..bb6cca99db3 100644
--- a/src/tests/keywords/randstr
+++ b/src/tests/keywords/randstr
@@ -21,17 +21,17 @@ if !(&Tmp-String-0 == "") {
 #
 #  Check length of output
 #
-if (%{strlen:%{Tmp-String-1}} != 3) {
+if (!(%{strlen:%{Tmp-String-1}} == 3)) {
 	test_fail
 }
 
-if (%{strlen:%{Tmp-String-2}} != 24) {
+if (!(%{strlen:%{Tmp-String-2}} == 24)) {
 	test_fail
 }
 #
 #  Check maximum repetition
 #
-if (%{strlen:%{Tmp-String-3}} != 1025) {
+if (!(%{strlen:%{Tmp-String-3}} == 1025)) {
 	test_fail
 }
 
@@ -47,7 +47,7 @@ if !(&Tmp-String-4 == "") {
 #
 #  Check repetition of binary output
 #
-if (%(length:%{Tmp-String-5}) != 10) {
+if (!(%(length:%{Tmp-String-5}) == 10)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/redundant b/src/tests/keywords/redundant
index 7ea82ffb9ae..17dcb412539 100644
--- a/src/tests/keywords/redundant
+++ b/src/tests/keywords/redundant
@@ -66,7 +66,7 @@ foreach &Tmp-Integer-1 {
 	}
 }
 
-if (&Tmp-Integer-0 != "%{Tmp-Integer-1[#]}") {
+if (!(&Tmp-Integer-0 == "%{Tmp-Integer-1[#]}")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/redundant-load-balance b/src/tests/keywords/redundant-load-balance
index 5966de527aa..ef1a03dfe1d 100644
--- a/src/tests/keywords/redundant-load-balance
+++ b/src/tests/keywords/redundant-load-balance
@@ -52,7 +52,7 @@ foreach &Tmp-Integer-1 {
 	}
 }
 
-if (&Tmp-Integer-0 != "%{Tmp-Integer-1[#]}") {
+if (!(&Tmp-Integer-0 == "%{Tmp-Integer-1[#]}")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/redundant-redundant b/src/tests/keywords/redundant-redundant
index 01f51c511d2..1001ac1ab9d 100644
--- a/src/tests/keywords/redundant-redundant
+++ b/src/tests/keywords/redundant-redundant
@@ -41,21 +41,21 @@ if (!ok) {
 	return
 }
 
-if (&Tmp-Integer-2 != 1) {
+if (!(&Tmp-Integer-2 == 1)) {
 	test_fail
 }
 
-if (&Tmp-Integer-3 != 1) {
+if (!(&Tmp-Integer-3 == 1)) {
 	test_fail
 	return
 }
 
-if (&Tmp-Integer-4 != 1) {
+if (!(&Tmp-Integer-4 == 1)) {
 	test_fail
 	return
 }
 
-if (&Tmp-Integer-5 != 1) {
+if (!(&Tmp-Integer-5 == 1)) {
 	test_fail
 	return
 }
diff --git a/src/tests/keywords/retry-section b/src/tests/keywords/retry-section
index 5df9fcdf2e3..cd848655d6a 100644
--- a/src/tests/keywords/retry-section
+++ b/src/tests/keywords/retry-section
@@ -15,7 +15,7 @@ group {
 	}
 }
 
-if (&Tmp-Integer-0 != 3) {
+if (!(&Tmp-Integer-0 == 3)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/return-break-mix b/src/tests/keywords/return-break-mix
index 877edcfc876..7fa33d6a20b 100644
--- a/src/tests/keywords/return-break-mix
+++ b/src/tests/keywords/return-break-mix
@@ -26,7 +26,7 @@ foreach &control.Tmp-Integer-0 {
 if (!&control.Tmp-Integer-0) {
 	test_fail
 }
-if (&control.Tmp-Integer-0[0] != 2) {
+if (!(&control.Tmp-Integer-0[0] == 2)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/sha1 b/src/tests/keywords/sha1
index 3636c0b6a5b..0630907c349 100644
--- a/src/tests/keywords/sha1
+++ b/src/tests/keywords/sha1
@@ -22,36 +22,36 @@
 #  Put "This is a string" into a file and call "sha1sum" on it.
 #  You should get this string.
 #
-if (&Tmp-Octets-2 != 0xcc7edf1ccc4bdf1e0ec8f72b95388b65218ecf0c) {
+if (!(&Tmp-Octets-2 == 0xcc7edf1ccc4bdf1e0ec8f72b95388b65218ecf0c)) {
 	test_fail
 }
 
-if (&Tmp-Octets-3 != 0xcc7edf1ccc4bdf1e0ec8f72b95388b65218ecf0c) {
+if (!(&Tmp-Octets-3 == 0xcc7edf1ccc4bdf1e0ec8f72b95388b65218ecf0c)) {
 	test_fail
 }
 
-if (&Tmp-Octets-4 != 0xcc7edf1ccc4bdf1e0ec8f72b95388b65218ecf0c) {
+if (!(&Tmp-Octets-4 == 0xcc7edf1ccc4bdf1e0ec8f72b95388b65218ecf0c)) {
 	test_fail
 }
 
 #
 # SHA1 of empty string
 #
-if (&Tmp-Octets-5 != 0xda39a3ee5e6b4b0d3255bfef95601890afd80709) {
+if (!(&Tmp-Octets-5 == 0xda39a3ee5e6b4b0d3255bfef95601890afd80709)) {
 	test_fail
 }
 
 #
 #  SHA1 HMAC with attribute references
 #
-if (&Tmp-Octets-6 != 0xeffcdf6ae5eb2fa2d27416d5f184df9c259a7c79) {
+if (!(&Tmp-Octets-6 == 0xeffcdf6ae5eb2fa2d27416d5f184df9c259a7c79)) {
 	test_fail
 }
 
 #
 #  SHA1 HMAC with empty key and data
 #
-if (&Tmp-Octets-7 != 0xfbdb1d1b18aa6c08324b7d64b71fb76370690e1d) {
+if (!(&Tmp-Octets-7 == 0xfbdb1d1b18aa6c08324b7d64b71fb76370690e1d)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/sha2 b/src/tests/keywords/sha2
index 9bba7e23f99..9dfc518451a 100644
--- a/src/tests/keywords/sha2
+++ b/src/tests/keywords/sha2
@@ -14,29 +14,29 @@
 #  Put "This is a string" into a file and call "sha2_256sum" on it.
 #  You should get this string.
 #
-if (&Tmp-Octets-1 != 0xb3716a1ab53042bb392034f29071e13b0c38aa19b4edd75d9a76022f91189124) {
+if (!(&Tmp-Octets-1 == 0xb3716a1ab53042bb392034f29071e13b0c38aa19b4edd75d9a76022f91189124)) {
 	test_fail
 }
 
-if (&Tmp-Octets-2 != 0xb3716a1ab53042bb392034f29071e13b0c38aa19b4edd75d9a76022f91189124) {
+if (!(&Tmp-Octets-2 == 0xb3716a1ab53042bb392034f29071e13b0c38aa19b4edd75d9a76022f91189124)) {
 	test_fail
 }
 
-if (&Tmp-Octets-3 != 0xb3716a1ab53042bb392034f29071e13b0c38aa19b4edd75d9a76022f91189124) {
+if (!(&Tmp-Octets-3 == 0xb3716a1ab53042bb392034f29071e13b0c38aa19b4edd75d9a76022f91189124)) {
 	test_fail
 }
 
 #
 #  SHA256 should also be able to cope with references to octet attributes
 #
-if (&Tmp-Octets-4 != 0xf307e202b881fded70e58017aa0c4d7b29c76ab25d02bf078301a5f6635187eb) {
+if (!(&Tmp-Octets-4 == 0xf307e202b881fded70e58017aa0c4d7b29c76ab25d02bf078301a5f6635187eb)) {
 	test_fail
 }
 
 #
 # SHA256 of empty string
 #
-if (&Tmp-Octets-5 != 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855) {
+if (!(&Tmp-Octets-5 == 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855)) {
 	test_fail
 }
 
@@ -48,15 +48,15 @@ if (&Tmp-Octets-5 != 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7
 &Tmp-Octets-2 := "%{sha2_512:%{Tmp-String-0}}"
 &Tmp-Octets-3 := "%{sha2_512:%{request.Tmp-Octets-0}}"
 
-if (&Tmp-Octets-1 != 0x56b57df5cce42d4e35c644649798ea23ec16f4f4626e78faf4d2d8f430ea349bcc28cd5532457c82f0aa66bf68988346039fe75b900a92ff94fd53993d45990f) {
+if (!(&Tmp-Octets-1 == 0x56b57df5cce42d4e35c644649798ea23ec16f4f4626e78faf4d2d8f430ea349bcc28cd5532457c82f0aa66bf68988346039fe75b900a92ff94fd53993d45990f)) {
 	test_fail
 }
 
-if (&Tmp-Octets-2 != 0x56b57df5cce42d4e35c644649798ea23ec16f4f4626e78faf4d2d8f430ea349bcc28cd5532457c82f0aa66bf68988346039fe75b900a92ff94fd53993d45990f) {
+if (!(&Tmp-Octets-2 == 0x56b57df5cce42d4e35c644649798ea23ec16f4f4626e78faf4d2d8f430ea349bcc28cd5532457c82f0aa66bf68988346039fe75b900a92ff94fd53993d45990f)) {
 	test_fail
 }
 
-if (&Tmp-Octets-3 != 0xde80271eb5e03a1c24dd0cd823a22305a743ee3a54f1de5bf97adbf56984561154bfb6928b1da4ccc3f5dde9f4032ad461937b60b9ace4ad3898cf45c90596d7) {
+if (!(&Tmp-Octets-3 == 0xde80271eb5e03a1c24dd0cd823a22305a743ee3a54f1de5bf97adbf56984561154bfb6928b1da4ccc3f5dde9f4032ad461937b60b9ace4ad3898cf45c90596d7)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/subrequest b/src/tests/keywords/subrequest
index f5ed01ccf69..4aef60c8c51 100644
--- a/src/tests/keywords/subrequest
+++ b/src/tests/keywords/subrequest
@@ -8,6 +8,6 @@ if (!&control.User-Name) {
 	test_fail
 }
 
-if (&control.User-Name != 'bob') {
+if (!(&control.User-Name == 'bob')) {
 	test_fail
 }
diff --git a/src/tests/keywords/subrequest-attr b/src/tests/keywords/subrequest-attr
index 19f4ed4b890..8f1f01338c9 100644
--- a/src/tests/keywords/subrequest-attr
+++ b/src/tests/keywords/subrequest-attr
@@ -16,6 +16,6 @@ if (!&control.User-Name) {
 	test_fail
 }
 
-if (&control.User-Name != 'bob') {
+if (!(&control.User-Name == 'bob')) {
 	test_fail
 }
diff --git a/src/tests/keywords/subrequest-if b/src/tests/keywords/subrequest-if
index 557407066dc..c88eda26710 100644
--- a/src/tests/keywords/subrequest-if
+++ b/src/tests/keywords/subrequest-if
@@ -8,7 +8,7 @@ subrequest Access-Request {
 		test_fail
 	}
 
-	if (&User-Name != 'bob') {
+	if (!(&User-Name == 'bob')) {
 		test_fail
 	}
 
diff --git a/src/tests/keywords/subrequest-return b/src/tests/keywords/subrequest-return
index 24e644b29a6..de8e098f2c8 100644
--- a/src/tests/keywords/subrequest-return
+++ b/src/tests/keywords/subrequest-return
@@ -13,7 +13,7 @@ if (&Tmp-String-1) {
 	test_fail
 }
 
-if (&Tmp-String-0 != "testing1234") {
+if (!(&Tmp-String-0 == "testing1234")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/subrequest-src-dst b/src/tests/keywords/subrequest-src-dst
index 4a622f74af2..e7d97a60dba 100644
--- a/src/tests/keywords/subrequest-src-dst
+++ b/src/tests/keywords/subrequest-src-dst
@@ -6,7 +6,7 @@ subrequest Access-Request &request &reply.Tmp-Group-0 {
 		test_fail
 	}
 
-	if (&User-Name != 'bob') {
+	if (!(&User-Name == 'bob')) {
 		test_fail
 	}
 
diff --git a/src/tests/keywords/subrequest-src-dst-nested b/src/tests/keywords/subrequest-src-dst-nested
index 405f74f682f..b45a7cdfc49 100644
--- a/src/tests/keywords/subrequest-src-dst-nested
+++ b/src/tests/keywords/subrequest-src-dst-nested
@@ -7,7 +7,7 @@ subrequest Access-Request &request &reply.Tmp-Group-0 {
 			test_fail
 		}
 
-		if (&User-Name != 'bob') {
+		if (!(&User-Name == 'bob')) {
 			test_fail
 		}
 
diff --git a/src/tests/keywords/tolower b/src/tests/keywords/tolower
index 5283ea49041..0cae57d2755 100644
--- a/src/tests/keywords/tolower
+++ b/src/tests/keywords/tolower
@@ -11,11 +11,11 @@
 &Tmp-String-2	:= "%{tolower:%{Tmp-String-9}}"
 
 
-if (&Tmp-String-0 != "abcde") {
+if (!(&Tmp-String-0 == "abcde")) {
 	test_fail
 }
 
-if (&Tmp-String-1 != "aabbccdd") {
+if (!(&Tmp-String-1 == "aabbccdd")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/toupper b/src/tests/keywords/toupper
index e08425dbed3..5dfbc992f37 100644
--- a/src/tests/keywords/toupper
+++ b/src/tests/keywords/toupper
@@ -7,11 +7,11 @@
 &Tmp-String-1	:= "%{toupper:AAbbCCdd}"
 &Tmp-String-2	:= "%{toupper:%{Tmp-String-9}}"
 
-if (&Tmp-String-0 != "ABCDE") {
+if (!(&Tmp-String-0 == "ABCDE")) {
 	test_fail
 }
 
-if (&Tmp-String-1 != "AABBCCDD") {
+if (!(&Tmp-String-1 == "AABBCCDD")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/truncation b/src/tests/keywords/truncation
index bd52e37d172..429f32eedaf 100644
--- a/src/tests/keywords/truncation
+++ b/src/tests/keywords/truncation
@@ -73,7 +73,7 @@ a02f4a3ab98d75992d68a15d393387fe9ef01041569570ad6fe884764e55567311bcacfcffae7655
 3ae4bcef324b9a3f47ba5c835b54a010ca42f3b9cc5368278c148c9b02ea8c4c9f244fd49f
 
 # Actual length of octet string is 4083 bytes
-if (%(length:%{Tmp-Octets-0}) != 4083) {
+if (!(%(length:%{Tmp-Octets-0}) == 4083)) {
 	test_fail
 }
 
@@ -84,7 +84,7 @@ if ("%{Tmp-Octets-0}" !~ /^0x([0-9a-f]+)$/) {
 
 &Tmp-String-0 := "%{1}"
 
-if ("%(length:%{Tmp-String-0})" != 8166) {
+if (!("%(length:%{Tmp-String-0})" == 8166)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/unknown b/src/tests/keywords/unknown
index 94ade08f031..c3790cb938f 100644
--- a/src/tests/keywords/unknown
+++ b/src/tests/keywords/unknown
@@ -10,7 +10,7 @@ update request {
 #
 &26.24757.84.9.5.7 := 0xab
 
-if (&26.24757.84.9.5.7 != 0xab) {
+if (!(&26.24757.84.9.5.7 == 0xab)) {
 	test_fail
 }
 
@@ -19,7 +19,7 @@ if (&26.24757.84.9.5.7 != 0xab) {
 #
 &26.24757.84.9.5.15 := 0xabcdef
 
-if (&26.24757.84.9.5.15 != 0xabcdef) {
+if (!(&26.24757.84.9.5.15 == 0xabcdef)) {
 	test_fail
 }
 
@@ -31,7 +31,7 @@ if (&26.11344.1 == 127.0.0.1) {
 	test_fail
 }
 
-if (&26.11344.1 != 127.0.0.2) {
+if (!(&26.11344.1 == 127.0.0.2)) {
 	test_fail
 }
 
@@ -41,7 +41,7 @@ if (&Vendor-Specific.FreeRADIUS.Proxied-To == 127.0.0.2) {
 	test_fail
 }
 
-if (&Vendor-Specific.FreeRADIUS.Proxied-To != 127.0.0.1) {
+if (!(&Vendor-Specific.FreeRADIUS.Proxied-To == 127.0.0.1)) {
 	test_fail
 }
 
@@ -49,13 +49,13 @@ if (&26.11344.1 == 127.0.0.2) {
 	test_fail
 }
 
-if (&26.11344.1 != 127.0.0.1) {
+if (!(&26.11344.1 == 127.0.0.1)) {
 	test_fail
 }
 
 &26.66.1 = 0x01020304
 
-if (&26.66.1 != 0x01020304) {
+if (!(&26.66.1 == 0x01020304)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-array b/src/tests/keywords/update-array
index 58ffdb0d378..8f57ff0203d 100644
--- a/src/tests/keywords/update-array
+++ b/src/tests/keywords/update-array
@@ -20,20 +20,20 @@ update request {
 	&Proxy-State += &Class[2]
 }
 
-if (&Proxy-State != 0x01020304) {
+if (!(&Proxy-State == 0x01020304)) {
 	test_fail
 }
 
 #  Must be the same as above
-if (&Proxy-State[0] != 0x01020304) {
+if (!(&Proxy-State[0] == 0x01020304)) {
 	test_fail
 }
 
-if (&Proxy-State[1] != 0x05060708) {
+if (!(&Proxy-State[1] == 0x05060708)) {
 	test_fail
 }
 
-if (&Proxy-State[2] != 0x090a0b0c) {
+if (!(&Proxy-State[2] == 0x090a0b0c)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-attr-ref-null b/src/tests/keywords/update-attr-ref-null
index 599ae69d3b0..2e787f2aad4 100644
--- a/src/tests/keywords/update-attr-ref-null
+++ b/src/tests/keywords/update-attr-ref-null
@@ -10,11 +10,11 @@ update request {
 	&control !* ANY
 }
 
-if ("%{Tmp-String-0[#]}" != 2) {
+if (!("%{Tmp-String-0[#]}" == 2)) {
 	test_fail
 }
 
-if (&Tmp-String-0[0] != 'foo') {
+if (!(&Tmp-String-0[0] == 'foo')) {
 	test_fail
 }
 
@@ -27,7 +27,7 @@ update {
 }
 
 # Should only remove 'bar'
-if (&Tmp-String-0[0] != 'foo') {
+if (!(&Tmp-String-0[0] == 'foo')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-delete b/src/tests/keywords/update-delete
index 5484f7e0cf5..d01367a3d58 100644
--- a/src/tests/keywords/update-delete
+++ b/src/tests/keywords/update-delete
@@ -8,7 +8,7 @@ update request {
 	&Tmp-IP-Address-0 := 192.0.2.1
 }
 
-if ((&Tmp-String-0 != 'foobarbaz') || (&Tmp-Integer-0 != 123456789) || (&Tmp-IP-Address-0 != 192.0.2.1)) {
+if (!((&Tmp-String-0 == 'foobarbaz')) || (!(&Tmp-Integer-0 == 123456789)) || (&Tmp-IP-Address-0 != 192.0.2.1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-exec b/src/tests/keywords/update-exec
index 5b706c09deb..0ee24aff16e 100644
--- a/src/tests/keywords/update-exec
+++ b/src/tests/keywords/update-exec
@@ -20,7 +20,7 @@ update {
 	&request = `/bin/sh -c "echo Tmp-String-0 := foo"`
 }
 
-if (!&Tmp-String-0 || (&Tmp-String-0 != 'foo')) {
+if (!&Tmp-String-0 || (!(&Tmp-String-0 == 'foo'))) {
 	test_fail
 }
 
@@ -31,7 +31,7 @@ update {
 	&request = `/bin/sh -c 'echo Tmp-String-0 := foo, Tmp-String-1 := bar'`
 }
 
-if (!&Tmp-String-0 || !&Tmp-String-1 || (&Tmp-String-0 != 'foo') || (&Tmp-String-1 != 'bar')) {
+if (!&Tmp-String-0 || !&Tmp-String-1 || (!(&Tmp-String-0 == 'foo')) || (!(&Tmp-String-1 == 'bar'))) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-filter b/src/tests/keywords/update-filter
index fdc11494f6c..a2bbf3c2bfa 100644
--- a/src/tests/keywords/update-filter
+++ b/src/tests/keywords/update-filter
@@ -25,15 +25,15 @@ update request {
 	&Tmp-Integer-0 == 10
 }
 
-if (&Tmp-Integer-0[0] != 10) {
+if (!(&Tmp-Integer-0[0] == 10)) {
 	test_fail
 }
 
-if ("%{Tmp-Integer-0[#]}" != 1) {
+if (!("%{Tmp-Integer-0[#]}" == 1)) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 3) {
+if (!("%{Tmp-String-0[#]}" == 3)) {
 	test_fail
 }
 
@@ -47,11 +47,11 @@ update request {
 	&Tmp-String-0 == 'baz'
 }
 
-if (&Tmp-String-0[0] != 'baz') {
+if (!(&Tmp-String-0[0] == 'baz')) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 1) {
+if (!("%{Tmp-String-0[#]}" == 1)) {
 	test_fail
 }
 
@@ -65,15 +65,15 @@ update request {
 	&Tmp-Integer-0 < 10
 }
 
-if (&Tmp-Integer-0[0] != 5) {
+if (!(&Tmp-Integer-0[0] == 5)) {
 	test_fail
 }
 
-if ("%{Tmp-Integer-0[#]}" != 1) {
+if (!("%{Tmp-Integer-0[#]}" == 1)) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 3) {
+if (!("%{Tmp-String-0[#]}" == 3)) {
 	test_fail
 }
 
@@ -87,20 +87,20 @@ update request {
 	&Tmp-Integer-0 > 10
 }
 
-if (&Tmp-Integer-0[0] != 15) {
+if (!(&Tmp-Integer-0[0] == 15)) {
 	test_fail
 }
 
-if (&Tmp-Integer-0[1] != 20) {
+if (!(&Tmp-Integer-0[1] == 20)) {
 	test_fail
 }
 
 
-if ("%{Tmp-Integer-0[#]}" != 2) {
+if (!("%{Tmp-Integer-0[#]}" == 2)) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 3) {
+if (!("%{Tmp-String-0[#]}" == 3)) {
 	test_fail
 }
 
@@ -115,19 +115,19 @@ update request {
 	&Tmp-Integer-0 <= 10
 }
 
-if (&Tmp-Integer-0[0] != 5) {
+if (!(&Tmp-Integer-0[0] == 5)) {
 	test_fail
 }
 
-if (&Tmp-Integer-0[1] != 10) {
+if (!(&Tmp-Integer-0[1] == 10)) {
 	test_fail
 }
 
-if ("%{Tmp-Integer-0[#]}" != 2) {
+if (!("%{Tmp-Integer-0[#]}" == 2)) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 3) {
+if (!("%{Tmp-String-0[#]}" == 3)) {
 	test_fail
 }
 
@@ -141,23 +141,23 @@ update request {
 	&Tmp-Integer-0 >= 10
 }
 
-if (&Tmp-Integer-0[0] != 10) {
+if (!(&Tmp-Integer-0[0] == 10)) {
 	test_fail
 }
 
-if (&Tmp-Integer-0[1] != 15) {
+if (!(&Tmp-Integer-0[1] == 15)) {
 	test_fail
 }
 
-if (&Tmp-Integer-0[2] != 20) {
+if (!(&Tmp-Integer-0[2] == 20)) {
 	test_fail
 }
 
-if ("%{Tmp-Integer-0[#]}" != 3) {
+if (!("%{Tmp-Integer-0[#]}" == 3)) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 3) {
+if (!("%{Tmp-String-0[#]}" == 3)) {
 	test_fail
 }
 
@@ -171,23 +171,23 @@ update request {
 	&Tmp-Integer-0 != 10
 }
 
-if (&Tmp-Integer-0[0] != 5) {
+if (!(&Tmp-Integer-0[0] == 5)) {
 	test_fail
 }
 
-if (&Tmp-Integer-0[1] != 15) {
+if (!(&Tmp-Integer-0[1] == 15)) {
 	test_fail
 }
 
-if (&Tmp-Integer-0[2] != 20) {
+if (!(&Tmp-Integer-0[2] == 20)) {
 	test_fail
 }
 
-if ("%{Tmp-Integer-0[#]}" != 3) {
+if (!("%{Tmp-Integer-0[#]}" == 3)) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 3) {
+if (!("%{Tmp-String-0[#]}" == 3)) {
 	test_fail
 }
 
@@ -206,11 +206,11 @@ update request {
 	&Tmp-String-0 == &Tmp-String-1[0]
 }
 
-if (&Tmp-String-0[0] != &Tmp-String-1[0]) {
+if (!(&Tmp-String-0[0] == &Tmp-String-1[0])) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 1) {
+if (!("%{Tmp-String-0[#]}" == 1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-hex b/src/tests/keywords/update-hex
index 90c659cc8a0..884ca5591c9 100644
--- a/src/tests/keywords/update-hex
+++ b/src/tests/keywords/update-hex
@@ -8,7 +8,7 @@ update {
 	&Tmp-String-0 := 0x626f62
 }
 
-if (&Tmp-String-0 != 'bob') {
+if (!(&Tmp-String-0 == 'bob')) {
 	test_fail
 }
 
@@ -16,7 +16,7 @@ update {
 	&Tmp-String-0 := '0x626f62'
 }
 
-if (&Tmp-String-0 != '0x626f62') {
+if (!(&Tmp-String-0 == '0x626f62')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-index b/src/tests/keywords/update-index
index 8ba62e10442..1f02b7f5702 100644
--- a/src/tests/keywords/update-index
+++ b/src/tests/keywords/update-index
@@ -7,7 +7,7 @@ update {
 	&control.Reply-Message += 'c'
 }
 
-if ((&control.Reply-Message[0] != 'a') || (&control.Reply-Message[1] != 'b') || (&control.Reply-Message[2] != 'c')) {
+if (!((&control.Reply-Message[0] == 'a')) || (!(&control.Reply-Message[1] == 'b')) || (&control.Reply-Message[2] != 'c')) {
 	test_fail
 }
 
@@ -16,7 +16,7 @@ update {
 	&control.Reply-Message[1] := 'd'
 }
 
-if ((&control.Reply-Message[0] != 'a') || (&control.Reply-Message[1] != 'd') || (&control.Reply-Message[2] != 'c')) {
+if (!((&control.Reply-Message[0] == 'a')) || (!(&control.Reply-Message[1] == 'd')) || (&control.Reply-Message[2] != 'c')) {
 	test_fail
 }
 
@@ -25,13 +25,13 @@ update {
 	&control.Reply-Message[0] := &control.Reply-Message[0]
 }
 
-if ((&control.Reply-Message[0] != 'a') || (&control.Reply-Message[1] != 'd') || (&control.Reply-Message[2] != 'c')) {
+if (!((&control.Reply-Message[0] == 'a')) || (!(&control.Reply-Message[1] == 'd')) || (&control.Reply-Message[2] != 'c')) {
 	test_fail
 }
 
 # Verify we haven't acquired any extra..
 
-if ("%{control.Reply-Message[#]}" != 3) {
+if (!("%{control.Reply-Message[#]}" == 3)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-list-null-rhs b/src/tests/keywords/update-list-null-rhs
index ad0c56587b3..8956c8be502 100644
--- a/src/tests/keywords/update-list-null-rhs
+++ b/src/tests/keywords/update-list-null-rhs
@@ -14,7 +14,7 @@ update request {
 	&control !* ANY
 }
 
-if (&Tmp-String-0[0] != 'foo') {
+if (!(&Tmp-String-0[0] == 'foo')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-null-value-assign b/src/tests/keywords/update-null-value-assign
index 5e0f1780b19..f3130c2de3f 100644
--- a/src/tests/keywords/update-null-value-assign
+++ b/src/tests/keywords/update-null-value-assign
@@ -24,7 +24,7 @@ update request {
 if (!&Tmp-String-0) {
 	test_fail
 }
-if (&Tmp-String-0 != '') {
+if (!(&Tmp-String-0 == '')) {
 	test_fail
 }
 
@@ -36,7 +36,7 @@ if (&Tmp-String-0 != '') {
 update request {
 	&Tmp-Octets-0 := "%{Reply-Message}"
 }
-if (&Tmp-Octets-0 != "") {
+if (!(&Tmp-Octets-0 == "")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-prepend b/src/tests/keywords/update-prepend
index fde9093829d..7c260d683dd 100644
--- a/src/tests/keywords/update-prepend
+++ b/src/tests/keywords/update-prepend
@@ -28,11 +28,11 @@ update request {
 }
 
 # The prepended value should be first followd by the other two
-if (("%{Tmp-String-0[0]}" != 'boink') || ("%{Tmp-String-0[1]}" != 'foo') || ("%{Tmp-String-0[2]}" != 'baz')) {
+if (!(("%{Tmp-String-0[0]}" == 'boink')) || (!("%{Tmp-String-0[1]}" == 'foo')) || ("%{Tmp-String-0[2]}" != 'baz')) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 3) {
+if (!("%{Tmp-String-0[#]}" == 3)) {
 	test_fail
 }
 
@@ -47,11 +47,11 @@ update {
 }
 
 # The attributes should now be "wibble", "foo", "baz", "boink", "foo", "baz"
-if (("%{Tmp-String-0[0]}" != 'wibble') || ("%{Tmp-String-0[1]}" != 'foo') || ("%{Tmp-String-0[2]}" != 'baz') || ("%{Tmp-String-0[3]}" != 'boink') || ("%{Tmp-String-0[4]}" != 'foo') || ("%{Tmp-String-0[5]}" != 'baz')) {
+if (!(("%{Tmp-String-0[0]}" == 'wibble')) || (!("%{Tmp-String-0[1]}" == 'foo')) || ("%{Tmp-String-0[2]}" != 'baz') || ("%{Tmp-String-0[3]}" != 'boink') || ("%{Tmp-String-0[4]}" != 'foo') || ("%{Tmp-String-0[5]}" != 'baz')) {
 	test_fail
 }
 
-if ("%{Tmp-String-0[#]}" != 6) {
+if (!("%{Tmp-String-0[#]}" == 6)) {
 	test_fail
 }
 
@@ -71,11 +71,11 @@ update {
 }
 
 # The control attributes should now be "wibble", "foo", "baz", "boink", "foo", "baz", "initial"
-if (("%{control.Tmp-String-0[0]}" != 'wibble') || ("%{control.Tmp-String-0[1]}" != 'foo') || ("%{control.Tmp-String-0[2]}" != 'baz') || ("%{control.Tmp-String-0[3]}" != 'boink') || ("%{control.Tmp-String-0[4]}" != 'foo') || ("%{control.Tmp-String-0[5]}" != 'baz') || ("%{control.Tmp-String-0[6]}" != 'initial')) {
+if (!(("%{control.Tmp-String-0[0]}" == 'wibble')) || (!("%{control.Tmp-String-0[1]}" == 'foo')) || ("%{control.Tmp-String-0[2]}" != 'baz') || ("%{control.Tmp-String-0[3]}" != 'boink') || ("%{control.Tmp-String-0[4]}" != 'foo') || ("%{control.Tmp-String-0[5]}" != 'baz') || ("%{control.Tmp-String-0[6]}" != 'initial')) {
 	test_fail
 }
 
-if ("%{control.Tmp-String-0[#]}" != 7) {
+if (!("%{control.Tmp-String-0[#]}" == 7)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-remove-any b/src/tests/keywords/update-remove-any
index 4260ed4ae23..7c184159d25 100644
--- a/src/tests/keywords/update-remove-any
+++ b/src/tests/keywords/update-remove-any
@@ -11,7 +11,7 @@ update {
 	&control.Tmp-IP-Address-1 := 192.0.3.1
 }
 
-if (("%{Tmp-IP-Address-0[0]}" != 192.0.2.1) || ("%{Tmp-IP-Address-0[1]}" != 192.0.2.2)) {
+if (!(("%{Tmp-IP-Address-0[0]}" == 192.0.2.1)) || (!("%{Tmp-IP-Address-0[1]}" == 192.0.2.2))) {
 	test_fail
 }
 
@@ -21,17 +21,17 @@ update {
 }
 
 # Non Tmp-IP-Address-0 address attributes should still be in the request list
-if ((&Tmp-String-0 != 'foobarbaz') || (&Tmp-Integer-0 != 123456789)) {
+if (!((&Tmp-String-0 == 'foobarbaz')) || (!(&Tmp-Integer-0 == 123456789))) {
 	test_fail
 }
 
 # There should be no Tmp-IP-Address attributes in the request list
-if (&Tmp-IP-Address-0 || ("%{Tmp-IP-Address-0[1]}" != '')) {
+if (&Tmp-IP-Address-0 || (!("%{Tmp-IP-Address-0[1]}" == ''))) {
 	test_fail
 }
 
 # But there should still be some in the control list
-if ((&control.Tmp-IP-Address-0 != 192.0.2.1) || ("%{control.Tmp-IP-Address-0[1]}" != 192.0.2.3)) {
+if (!((&control.Tmp-IP-Address-0 == 192.0.2.1)) || (!("%{control.Tmp-IP-Address-0[1]}" == 192.0.2.3))) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-remove-list b/src/tests/keywords/update-remove-list
index 5484f7e0cf5..d01367a3d58 100644
--- a/src/tests/keywords/update-remove-list
+++ b/src/tests/keywords/update-remove-list
@@ -8,7 +8,7 @@ update request {
 	&Tmp-IP-Address-0 := 192.0.2.1
 }
 
-if ((&Tmp-String-0 != 'foobarbaz') || (&Tmp-Integer-0 != 123456789) || (&Tmp-IP-Address-0 != 192.0.2.1)) {
+if (!((&Tmp-String-0 == 'foobarbaz')) || (!(&Tmp-Integer-0 == 123456789)) || (&Tmp-IP-Address-0 != 192.0.2.1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-to-edit b/src/tests/keywords/update-to-edit
index 851f431c9bd..578bd01371e 100644
--- a/src/tests/keywords/update-to-edit
+++ b/src/tests/keywords/update-to-edit
@@ -36,11 +36,11 @@ update reply {
 	&Tmp-Integer-0 += 13
 }
 
-if (&reply.Tmp-Integer-0[0] != 12) {
+if (!(&reply.Tmp-Integer-0[0] == 12)) {
 	test_fail
 }
 
-if (&reply.Tmp-Integer-0[1] != 13) {
+if (!(&reply.Tmp-Integer-0[1] == 13)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/urlquote b/src/tests/keywords/urlquote
index 3b71d90ca88..5345dca93a7 100644
--- a/src/tests/keywords/urlquote
+++ b/src/tests/keywords/urlquote
@@ -19,23 +19,23 @@
 }
 
 
-if (&Tmp-String-1 != &Tmp-String-0) {
+if (!(&Tmp-String-1 == &Tmp-String-0)) {
 	test_fail
 }
 
-if (&Tmp-String-3 != &Tmp-String-6) {
+if (!(&Tmp-String-3 == &Tmp-String-6)) {
 	test_fail
 }
 
-if (&Tmp-String-5 != &Tmp-String-8) {
+if (!(&Tmp-String-5 == &Tmp-String-8)) {
 	test_fail
 }
 
-if (&Tmp-String-7 != &Tmp-String-2) {
+if (!(&Tmp-String-7 == &Tmp-String-2)) {
 	test_fail
 }
 
-if (&Tmp-String-9 != &Tmp-String-4) {
+if (!(&Tmp-String-9 == &Tmp-String-4)) {
 	test_fail
 }
 
@@ -44,7 +44,7 @@ if (&Tmp-String-9 != &Tmp-String-4) {
 &request -= &Tmp-String-2[*]
 &Tmp-String-2 := "%{urlunquote:%%E,123}"
 
-if (&Tmp-String-1 != &Tmp-String-0) {
+if (!(&Tmp-String-1 == &Tmp-String-0)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/vendor_specific.raw b/src/tests/keywords/vendor_specific.raw
index db596222e38..331140aa447 100644
--- a/src/tests/keywords/vendor_specific.raw
+++ b/src/tests/keywords/vendor_specific.raw
@@ -10,7 +10,7 @@ update request {
 if (!&raw.26) {
 	test_fail
 }
-elsif (&raw.26 != 0x01020304) {
+elsif (!(&raw.26 == 0x01020304)) {
 	test_fail
 }
 else {
diff --git a/src/tests/keywords/wimax b/src/tests/keywords/wimax
index a0ccbbfc55e..f6857a1b944 100644
--- a/src/tests/keywords/wimax
+++ b/src/tests/keywords/wimax
@@ -2,7 +2,7 @@ update request {
 	&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Port = 6809
 }
 
-if (&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Port != 6809) {
+if (!(&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Port == 6809)) {
 	test_fail
 }
 
@@ -12,7 +12,7 @@ update request {
 	&26.24757.84.9.5.7 = 0x01
 }
 
-if (&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Assigned != 1) {
+if (!(&Vendor-Specific.WiMAX.Packet-Flow-Descriptor-v2.Classifier.Src-Spec.Assigned == 1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-alternation b/src/tests/keywords/xlat-alternation
index fb5e7a2acf3..38df4b97805 100644
--- a/src/tests/keywords/xlat-alternation
+++ b/src/tests/keywords/xlat-alternation
@@ -9,7 +9,7 @@
 #  First choice
 #
 &Tmp-String-2 := "%{%{Tmp-String-0}:-%{Tmp-String-1}}"
-if (&Tmp-String-2 != 'foo') {
+if (!(&Tmp-String-2 == 'foo')) {
 	test_fail
 }
 
@@ -18,7 +18,7 @@ if (&Tmp-String-2 != 'foo') {
 #
 &request -= &Tmp-String-0[*]
 &Tmp-String-2 := "%{%{Tmp-String-0}:-%{Tmp-String-1}}"
-if (&Tmp-String-2 != 'bar') {
+if (!(&Tmp-String-2 == 'bar')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-attr-index b/src/tests/keywords/xlat-attr-index
index fc6bfd02f84..dc167b13cf5 100644
--- a/src/tests/keywords/xlat-attr-index
+++ b/src/tests/keywords/xlat-attr-index
@@ -2,15 +2,15 @@
 	&Tmp-IP-Address-0 = 192.0.2.1
 	&Tmp-IP-Address-0 = 192.0.2.2
 }
-if ("%{Tmp-IP-Address-0[#]}" != 2) {
+if (!("%{Tmp-IP-Address-0[#]}" == 2)) {
 	test_fail
 }
 
-if ((&Tmp-IP-Address-0[0] != 192.0.2.1) || ("%{Tmp-IP-Address-0[1]}" != 192.0.2.2)) {
+if (!((&Tmp-IP-Address-0[0] == 192.0.2.1)) || (!("%{Tmp-IP-Address-0[1]}" == 192.0.2.2))) {
 	test_fail
 }
 
-if ("%{Tmp-IP-Address-0[*]}" != '192.0.2.1192.0.2.2') {
+if (!("%{Tmp-IP-Address-0[*]}" == '192.0.2.1192.0.2.2')) {
 	test_fail
 }
 
@@ -23,11 +23,11 @@ if ("%{Tmp-IP-Address-0[*]}" != '192.0.2.1192.0.2.2') {
 	&Tmp-Integer-0 = "%{Tmp-IP-Address-0[#]}"
 }
 
-if (&Tmp-String-0 != '192.0.2.1,192.0.2.2') {
+if (!(&Tmp-String-0 == '192.0.2.1,192.0.2.2')) {
 	test_fail
 }
 
-if (&Tmp-Integer-0 != 2) {
+if (!(&Tmp-Integer-0 == 2)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-config b/src/tests/keywords/xlat-config
index 45ab1a41c97..d51b54b6192 100644
--- a/src/tests/keywords/xlat-config
+++ b/src/tests/keywords/xlat-config
@@ -3,13 +3,13 @@
 #
 
 &Tmp-String-0 := "%(config:modules.test.boolean)"
-if (&Tmp-String-0 != "no") {
+if (!(&Tmp-String-0 == "no")) {
 	test_fail
 }
 
 &Tmp-String-0 := "test"
 &Tmp-Integer-0 := "%(config:modules.%{Tmp-String-0}.integer)"
-if (&Tmp-Integer-0 != 1) {
+if (!(&Tmp-Integer-0 == 1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-dhcpv4 b/src/tests/keywords/xlat-dhcpv4
index e6efb2cdd9a..341d46fa5b8 100644
--- a/src/tests/keywords/xlat-dhcpv4
+++ b/src/tests/keywords/xlat-dhcpv4
@@ -3,15 +3,15 @@
 #
 
 &Tmp-Octets-0 := 0x520d0103abcdef0206010203040506
-if ("%(decode.dhcpv4:%{Tmp-Octets-0})" != 2) {
+if (!("%(decode.dhcpv4:%{Tmp-Octets-0})" == 2)) {
 	test_fail
 }
 
-if (&Relay-Agent-Information.Circuit-Id != 0xabcdef) {
+if (!(&Relay-Agent-Information.Circuit-Id == 0xabcdef)) {
 	test_fail
 }
 
-if (&Relay-Agent-Information.Remote-Id != 0x010203040506) {
+if (!(&Relay-Agent-Information.Remote-Id == 0x010203040506)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-double-alternation b/src/tests/keywords/xlat-double-alternation
index c89e152b51b..4f94291bf86 100644
--- a/src/tests/keywords/xlat-double-alternation
+++ b/src/tests/keywords/xlat-double-alternation
@@ -1,6 +1,6 @@
 # Regression test for double consecutive alternations
 &Tmp-uint64-0 := "%{%{Acct-Input-Octets}:-2}%{%{Acct-Input-Gigawords}:-1}"
-if (&Tmp-uint64-0 != 21) {
+if (!(&Tmp-uint64-0 == 21)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-escape b/src/tests/keywords/xlat-escape
index 7904dec7e8b..01b10009d6f 100644
--- a/src/tests/keywords/xlat-escape
+++ b/src/tests/keywords/xlat-escape
@@ -12,7 +12,7 @@ if ("%{tolower:\%{ FOO}" != '%{ foo') {
 	test_fail
 }
 
-if ("\%D" != '%D') {
+if (!("\%D" == '%D')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-eval b/src/tests/keywords/xlat-eval
index d608f9a2ae7..9224802dcf7 100644
--- a/src/tests/keywords/xlat-eval
+++ b/src/tests/keywords/xlat-eval
@@ -11,25 +11,25 @@
 #
 #  Verify non string types are treated as literals
 #
-if ("%{eval:%{Tmp-Integer-0}}" != 4) {
+if (!("%{eval:%{Tmp-Integer-0}}" == 4)) {
 	test_fail
 }
 
-if ("%{eval:%{Tmp-Integer-0[1]}}" != 8) {
+if (!("%{eval:%{Tmp-Integer-0[1]}}" == 8)) {
 	test_fail
 }
 
 #
 #  Check double expansion works
 #
-if ("%{eval:%{Tmp-String-0}}" != 'foo') {
+if (!("%{eval:%{Tmp-String-0}}" == 'foo')) {
 	test_fail
 }
 
 #
 #  Using an attribute as a dynamic index for another attribute
 #
-if ("%{eval:\%{Tmp-String-1[%{Tmp-Integer-0[2]}]\}}" != 'bar') {
+if (!("%{eval:\%{Tmp-String-1[%{Tmp-Integer-0[2]}]\}}" == 'bar')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-exec b/src/tests/keywords/xlat-exec
index 38021333a85..233e1d3758f 100644
--- a/src/tests/keywords/xlat-exec
+++ b/src/tests/keywords/xlat-exec
@@ -12,7 +12,7 @@ if (&Tmp-String-1 != "hello foo:1234 world") {
 
 # User-Password contains characters that need escaping
 &Tmp-String-2 := `/bin/echo %{User-Password}`
-if (&Tmp-String-2 != &User-Password) {
+if (!(&Tmp-String-2 == &User-Password)) {
 	test_fail
 } else {
 	&User-Password := "hello"
diff --git a/src/tests/keywords/xlat-explode b/src/tests/keywords/xlat-explode
index 7e46b0c76c3..5c432150ec6 100644
--- a/src/tests/keywords/xlat-explode
+++ b/src/tests/keywords/xlat-explode
@@ -25,15 +25,15 @@
 
 debug_all
 
-if ("%{Tmp-String-1}" != "1=1,my_attr=2,my_attr=hello") {
+if (!("%{Tmp-String-1}" == "1=1,my_attr=2,my_attr=hello")) {
 	test_fail
 }
 
-if ("%{Tmp-String-2}" != "") {
+if (!("%{Tmp-String-2}" == "")) {
 	test_fail
 }
 
-if ("%{Tmp-String-3}" != "hello,goodbye,morning,night,1") {
+if (!("%{Tmp-String-3}" == "hello,goodbye,morning,night,1")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-inline b/src/tests/keywords/xlat-inline
index 86e6d3eb705..c3d192eb986 100644
--- a/src/tests/keywords/xlat-inline
+++ b/src/tests/keywords/xlat-inline
@@ -2,7 +2,7 @@
 &Tmp-Integer-0 := "%(debug:4)"
 
 # Check debug level is now 4
-if ("%(debug:4)" != 4) {
+if (!("%(debug:4)" == 4)) {
 	test_fail
 }
 
@@ -10,7 +10,7 @@ if ("%(debug:4)" != 4) {
 "%(debug:%{Tmp-Integer-0})"
 
 # Read out the current debug level to verify it changed
-if ("%(debug:%{Tmp-Integer-0})" != "%{Tmp-Integer-0}") {
+if (!("%(debug:%{Tmp-Integer-0})" == "%{Tmp-Integer-0}")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-interpreter b/src/tests/keywords/xlat-interpreter
index 3403e16212a..f7fd52eff6e 100644
--- a/src/tests/keywords/xlat-interpreter
+++ b/src/tests/keywords/xlat-interpreter
@@ -10,19 +10,19 @@
 &Tmp-String-1 := "%(interpreter:.name)"
 &Tmp-String-2 := "%(interpreter:.type)"
 
-if (&Tmp-String-0 != "src/tests/keywords/xlat-interpreter") {
+if (!(&Tmp-String-0 == "src/tests/keywords/xlat-interpreter")) {
 	test_fail
 }
 
-if (&Tmp-String-1 != "&Tmp-String-1") {
+if (!(&Tmp-String-1 == "&Tmp-String-1")) {
 	test_fail
 }
 
-if (&Tmp-String-2 != "edit") {
+if (!(&Tmp-String-2 == "edit")) {
 	test_fail
 }
 
-if (&Tmp-Integer-0 != 9) {
+if (!(&Tmp-Integer-0 == 9)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-octets b/src/tests/keywords/xlat-octets
index b2374c32418..5b07413b94b 100644
--- a/src/tests/keywords/xlat-octets
+++ b/src/tests/keywords/xlat-octets
@@ -10,15 +10,15 @@
 	&Tmp-Octets-0 = 0x0706050403020100
 }
 
-if ("%{Tmp-Octets-0}" != '0x0001020304050607') {
+if (!("%{Tmp-Octets-0}" == '0x0001020304050607')) {
 	test_fail
 }
 
-if ("%{Tmp-Octets-0[0]}" != '0x0001020304050607') {
+if (!("%{Tmp-Octets-0[0]}" == '0x0001020304050607')) {
 	test_fail
 }
 
-if ("%{Tmp-Octets-0[*]}" != '0x00010203040506070x0706050403020100') {
+if (!("%{Tmp-Octets-0[*]}" == '0x00010203040506070x0706050403020100')) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-string b/src/tests/keywords/xlat-string
index 0885bd0ca54..045d36145c3 100644
--- a/src/tests/keywords/xlat-string
+++ b/src/tests/keywords/xlat-string
@@ -22,7 +22,7 @@
 #  like every other data type.  If we want to *convert* the octets to
 #  a string, we have to use "%{string:...}"
 #
-if ((string)&Tmp-Octets-0 != "0x5c5c") {
+if (!((string)&Tmp-Octets-0 == "0x5c5c")) {
 	test_fail
 }
 
@@ -33,7 +33,7 @@ if ((string)&Tmp-Octets-0 == 0x5c5c) {
 	test_fail
 }
 
-if (&Tmp-String-0 != "\\\\") {
+if (!(&Tmp-String-0 == "\\\\")) {
 	test_fail
 }
 
@@ -47,15 +47,15 @@ if ((string)&Tmp-Octets-0 == "%{string:%{Tmp-Octets-0}}") {
 #
 #  Test interpolation between string expansions and strings
 #
-if ("%{string:%{Tmp-Octets-4}}%{string:%{Tmp-Octets-5}}" != "test1test2") {
+if (!("%{string:%{Tmp-Octets-4}}%{string:%{Tmp-Octets-5}}" == "test1test2")) {
 	test_fail
 }
 
-if ("test0%{string:%{Tmp-Octets-4}}%{string:%{Tmp-Octets-5}}" != "test0test1test2") {
+if (!("test0%{string:%{Tmp-Octets-4}}%{string:%{Tmp-Octets-5}}" == "test0test1test2")) {
 	test_fail
 }
 
-if ("%{string:%{Tmp-Octets-4}}%{string:%{Tmp-Octets-5}}test3" != "test1test2test3") {
+if (!("%{string:%{Tmp-Octets-4}}%{string:%{Tmp-Octets-5}}test3" == "test1test2test3")) {
 	test_fail
 }
 
@@ -63,11 +63,11 @@ if (&Tmp-String-1 != 'I like chicken I like liver') {
 	test_fail
 }
 
-if (&Tmp-String-2 != "I\000I") {
+if (!(&Tmp-String-2 == "I\000I")) {
 	test_fail
 }
 
-if (&Tmp-String-3 != "\000") {
+if (!(&Tmp-String-3 == "\000")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-subst b/src/tests/keywords/xlat-subst
index ada646f475e..b5efd019e78 100644
--- a/src/tests/keywords/xlat-subst
+++ b/src/tests/keywords/xlat-subst
@@ -77,7 +77,7 @@ if ("%(subst:%{Tmp-String-0} /z/ b)" != 'aaa') {
 #
 
 # Check that newlines really are newlines
-if ("%(length:%{Tmp-String-1})" != 3) {
+if (!("%(length:%{Tmp-String-1})" == 3)) {
 	test_fail
 }