From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 5 Dec 2018 15:00:21 +0000 (-0500)
Subject: Fix more tests
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c1931c3b125e92de473154891cd159647cb2b57;p=thirdparty%2Ffreeradius-server.git

Fix more tests
---

diff --git a/src/tests/keywords/foreach-break b/src/tests/keywords/foreach-break
index 6333e39637e..2b5a3465b72 100644
--- a/src/tests/keywords/foreach-break
+++ b/src/tests/keywords/foreach-break
@@ -5,10 +5,10 @@
 #  We DON'T want to see this one.
 #
 update request {
-       Filter-Id += "broken"
+       &Filter-Id += "broken"
 }
 
-foreach Filter-Id {
+foreach &Filter-Id {
 	#
 	#  If we see this one, "break" out of the
 	#  foreach loop.
@@ -18,7 +18,7 @@ foreach Filter-Id {
 	}
 
 	update reply {
-	       Called-Station-Id += "%{Foreach-Variable-0}"
+		&Called-Station-Id += "%{Foreach-Variable-0}"
 	}
 }
 
@@ -27,14 +27,14 @@ foreach Filter-Id {
 # Adding attribute during request and immediately breaking
 #
 update {
-	request:Filter-Id += "1"
-	request:Filter-Id += "2"
+	&request:Filter-Id += "1"
+	&request:Filter-Id += "2"
 }
 
 foreach &request:Reply-Message {
 	if("%{Foreach-Variable-0}" == "1") {
 		update {
-			request:Filter-Id += "3"
+			&request:Filter-Id += "3"
 		}
 		break
 
@@ -43,21 +43,21 @@ foreach &request:Reply-Message {
 }
 
 update {
-	request:Filter-Id !* ANY
+	&request:Filter-Id !* ANY
 }
 
 #
 # Adding attribute during request and continuing
 #
 update {
-	request:Filter-Id += "1"
-	request:Filter-Id += "2"
+	&request:Filter-Id += "1"
+	&request:Filter-Id += "2"
 }
 
 foreach &request:Reply-Message {
 	if("%{Foreach-Variable-0}" == "1") {
 		update {
-			request:Filter-Id += "3"
+			&request:Filter-Id += "3"
 		}
 	}
 
diff --git a/src/tests/keywords/foreach-break-2 b/src/tests/keywords/foreach-break-2
index b994f5042e5..ba142db294f 100644
--- a/src/tests/keywords/foreach-break-2
+++ b/src/tests/keywords/foreach-break-2
@@ -3,7 +3,7 @@
 #
 
 update request {
-	Calling-Station-Id := "ABCDEF_8"
+	&Calling-Station-Id := "ABCDEF_8"
 }
 
 update control {
@@ -26,10 +26,10 @@ update control {
 	&Tmp-String-0 += "g"
 }
 
-foreach control:Tmp-String-0 {
+foreach &control:Tmp-String-0 {
 	if ("%{Calling-Station-Id[*]}" =~ /([A-Z0-9\-]*)_%{Foreach-Variable-0}/) {
 		update request {
-			Called-Station-Id := "%{1}"
+			&Called-Station-Id := "%{1}"
 		}
 		success
 		break
diff --git a/src/tests/keywords/foreach-break-3 b/src/tests/keywords/foreach-break-3
index ee8fc1985d7..8bf45dd3295 100644
--- a/src/tests/keywords/foreach-break-3
+++ b/src/tests/keywords/foreach-break-3
@@ -3,7 +3,7 @@
 #
 
 update request {
-	Calling-Station-Id := "8"
+	&Calling-Station-Id := "8"
 }
 
 update control {
diff --git a/src/tests/keywords/foreach-break-4 b/src/tests/keywords/foreach-break-4
index abbf4089746..87ae07f0132 100644
--- a/src/tests/keywords/foreach-break-4
+++ b/src/tests/keywords/foreach-break-4
@@ -3,7 +3,7 @@
 #
 
 update request {
-	Calling-Station-Id := "8"
+	&Calling-Station-Id := "8"
 }
 
 update control {
diff --git a/src/tests/keywords/foreach-isolation b/src/tests/keywords/foreach-isolation
index c4331d2e40d..11c0a9253fc 100644
--- a/src/tests/keywords/foreach-isolation
+++ b/src/tests/keywords/foreach-isolation
@@ -9,12 +9,12 @@ update {
 	&control:Tmp-String-0 += '3'
 }
 
-foreach control:Tmp-String-0 {
+foreach &control:Tmp-String-0 {
 	update control {
-		Tmp-String-0 -= "%{expr:%{Foreach-Variable-0} + 1}"
+		&Tmp-String-0 -= "%{expr:%{Foreach-Variable-0} + 1}"
 	}
 	update request {
-		Tmp-String-0 += "%{Foreach-Variable-0}"
+		&Tmp-String-0 += "%{Foreach-Variable-0}"
 	}
 }
 
diff --git a/src/tests/keywords/foreach-list b/src/tests/keywords/foreach-list
index 4780e4fdf1e..14084d60181 100644
--- a/src/tests/keywords/foreach-list
+++ b/src/tests/keywords/foreach-list
@@ -1,5 +1,5 @@
 foreach &request: {
 	update reply {
-		Called-Station-Id += "%{Foreach-Variable-0}"
+		&Called-Station-Id += "%{Foreach-Variable-0}"
 	}
 }
diff --git a/src/tests/keywords/foreach-nested b/src/tests/keywords/foreach-nested
index b6109a3db11..49e6be9ab6e 100644
--- a/src/tests/keywords/foreach-nested
+++ b/src/tests/keywords/foreach-nested
@@ -1,9 +1,9 @@
 # PRE: foreach
 #
-foreach Filter-Id {
-	foreach Calling-Station-Id {
+foreach &Filter-Id {
+	foreach &Calling-Station-Id {
 		update reply {
-			Called-Station-Id += "%{Foreach-Variable-0} %{Foreach-Variable-1}"
+			&Called-Station-Id += "%{Foreach-Variable-0} %{Foreach-Variable-1}"
 		}
 	}
 }
diff --git a/src/tests/keywords/foreach-regex b/src/tests/keywords/foreach-regex
index dab57a3a9fb..f5791d5efb1 100644
--- a/src/tests/keywords/foreach-regex
+++ b/src/tests/keywords/foreach-regex
@@ -3,23 +3,23 @@
 # This is what most people end up using foreach for,
 # so we should probably test it works.
 update request {
-	Tmp-String-0 := "cisco"
+	&Tmp-String-0 := "cisco"
 }
 
 # Expanded regex
-foreach Cisco-AVPair {
+foreach &Cisco-AVPair {
 	if ("%{Foreach-Variable-0}"  =~ /^%{Tmp-String-0}=(.*)$/i) {
 		update reply {
-			Called-Station-Id += "%{1}"
+			&Called-Station-Id += "%{1}"
 		}
 	}
 }
 
 # Compiled regex
-foreach Cisco-AVPair {
+foreach &Cisco-AVPair {
 	if ("%{Foreach-Variable-0}"  =~ /^stupid=(.*)$/i) {
 		update reply {
-			Called-Station-Id += "%{1}"
+			&Called-Station-Id += "%{1}"
 		}
 	}
 }
diff --git a/src/tests/keywords/foreach-return b/src/tests/keywords/foreach-return
index b1a24d80ea2..b5f22d453c9 100644
--- a/src/tests/keywords/foreach-return
+++ b/src/tests/keywords/foreach-return
@@ -2,18 +2,18 @@
 #
 
 update control {
-	Cleartext-Password := 'hello'
+	&Cleartext-Password := 'hello'
 }
 
 #
 # Adding attribute during request and immediately returning should still work
 #
 update request {
-	Filter-Id := "1"
-	Filter-Id += "2"
-	Filter-Id += "3"
-	Filter-Id += "4"
-	Filter-Id += "5"
+	&Filter-Id := "1"
+	&Filter-Id += "2"
+	&Filter-Id += "3"
+	&Filter-Id += "4"
+	&Filter-Id += "5"
 }
 
 foreach &Filter-Id {
@@ -26,14 +26,14 @@ foreach &Filter-Id {
 		#  in the "authorize" section.
 		#
 		update control {
-			Auth-Type := PAP
+			&Auth-Type := PAP
 		}
-		
+
 		#
 		#  Stop processing "authorize", and go to the next section.
 		#
 		return
-		
+
 		#
 		#  Shouldn't reach this
 		#
diff --git a/src/tests/keywords/foreach-varied-depth b/src/tests/keywords/foreach-varied-depth
index aa5d3e47a95..cc093839470 100644
--- a/src/tests/keywords/foreach-varied-depth
+++ b/src/tests/keywords/foreach-varied-depth
@@ -1,13 +1,13 @@
 update {
-	control:Tmp-String-0 := "ssid=ABCDEF"
-	control:Tmp-String-0 += "ssid=GHIJKL"
+	&control:Tmp-String-0 := "ssid=ABCDEF"
+	&control:Tmp-String-0 += "ssid=GHIJKL"
 }
 
-if (User-Name) {
+if (&User-Name) {
 	foreach &control:Tmp-String-0 {
 		if ("%{Foreach-Variable-0}" =~ /(.*)/) {
 			update control {
-				Tmp-String-1 := "%{1}"
+				&Tmp-String-1 := "%{1}"
 			}
 		}
 	}
@@ -18,13 +18,13 @@ if (&control:Tmp-String-1 != 'ssid=GHIJKL') {
 }
 
 update control {
-	Tmp-String-1 !* ANY
+	&Tmp-String-1 !* ANY
 }
 
 foreach &control:Tmp-String-0 {
 	if ("%{Foreach-Variable-0}" =~ /(.*)/) {
 		update control {
-			Tmp-String-1 := "%{1}"
+			&Tmp-String-1 := "%{1}"
 		}
 	}
 }
@@ -34,7 +34,7 @@ if (&control:Tmp-String-1 != 'ssid=GHIJKL') {
 }
 
 update control {
-	Tmp-String-1 !* ANY
+	&Tmp-String-1 !* ANY
 }
 
 success
diff --git a/src/tests/keywords/if-bob b/src/tests/keywords/if-bob
index 066cbee2be2..93f0ddd1723 100644
--- a/src/tests/keywords/if-bob
+++ b/src/tests/keywords/if-bob
@@ -2,12 +2,12 @@
 #
 #  Matching "if" conditions
 #
-if (User-Name == "bob") {
+if (&User-Name == "bob") {
 	success
 }
 
-if (User-Name != "bob") {
+if (&User-Name != "bob") {
 	update reply {
-		Filter-Id := "not bob"
+		&Filter-Id := "not bob"
 	}
 }
diff --git a/src/tests/keywords/if-else b/src/tests/keywords/if-else
index 43f8d2b6fe5..568298bd343 100644
--- a/src/tests/keywords/if-else
+++ b/src/tests/keywords/if-else
@@ -3,9 +3,9 @@
 #
 #  Matching "if" conditions
 #
-if (User-Name != "bob") {
+if (&User-Name != "bob") {
 	update reply {
-		Filter-Id := "not bob"
+		&Filter-Id := "not bob"
 	}
 }
 else {
diff --git a/src/tests/keywords/if-elsif b/src/tests/keywords/if-elsif
index c326e7ba6fe..1d3b893e1c5 100644
--- a/src/tests/keywords/if-elsif
+++ b/src/tests/keywords/if-elsif
@@ -2,16 +2,16 @@
 #
 #  Matching "if" conditions
 #
-if (User-Name != "bob") {
+if (&User-Name != "bob") {
 	update reply {
-		Filter-Id := "not bob"
+		&Filter-Id := "not bob"
 	}
 }
-elsif (User-Name == "bob") {
+elsif (&User-Name == "bob") {
 	success
 }
 else {
 	update reply {
-		Filter-Id := "last else"
+		&Filter-Id := "last else"
 	}
 }
diff --git a/src/tests/keywords/if-multivalue b/src/tests/keywords/if-multivalue
index 059f3e09c36..72f77077f5f 100644
--- a/src/tests/keywords/if-multivalue
+++ b/src/tests/keywords/if-multivalue
@@ -2,49 +2,49 @@
 # PRE: update if
 #
 update {
-       control:Cleartext-Password := 'hello'
+	&control:Cleartext-Password := 'hello'
 }
 
 update request {
-	Tmp-String-0 := 'foo'
-	Tmp-String-0 += 'bar'
-	Tmp-String-0 += 'baz'
+	&Tmp-String-0 := 'foo'
+	&Tmp-String-0 += 'bar'
+	&Tmp-String-0 += 'baz'
 
-	Tmp-String-1 := 'GROUP ADMINISTRATORS'
-	Tmp-String-1 += 'GROUP STUDENTS'
-	Tmp-String-1 += 'GROUP PEONS'
+	&Tmp-String-1 := 'GROUP ADMINISTRATORS'
+	&Tmp-String-1 += 'GROUP STUDENTS'
+	&Tmp-String-1 += 'GROUP PEONS'
 
-	Tmp-String-2 := 'PEONS'
-	Tmp-String-2 += 'STUDENTS'
-	Tmp-String-2 += 'ADMINISTRATORS'
+	&Tmp-String-2 := 'PEONS'
+	&Tmp-String-2 += 'STUDENTS'
+	&Tmp-String-2 += 'ADMINISTRATORS'
 
-	Tmp-String-3 := 'no'
-	Tmp-String-3 += 'no'
-	Tmp-String-3 += 'yes'
+	&Tmp-String-3 := 'no'
+	&Tmp-String-3 += 'no'
+	&Tmp-String-3 += 'yes'
 
-	Tmp-Integer-0 := 1
-	Tmp-Integer-0 += 2
-	Tmp-Integer-0 += 5
+	&Tmp-Integer-0 := 1
+	&Tmp-Integer-0 += 2
+	&Tmp-Integer-0 += 5
 }
 
 update control {
-	Tmp-String-0 := 'foo'
-	Tmp-String-0 += 'bar'
-	Tmp-String-0 += 'baz'
-
-	Tmp-String-1 := 'boink'
-	Tmp-String-1 += 'tard'
-	Tmp-String-1 += 'dink'
-	Tmp-String-1 += 'slink'
-
-	Tmp-Integer-0 := 01
-	Tmp-Integer-0 += 02
-	Tmp-Integer-0 += 05
-	Tmp-Integer-0 += 04
-
-	Tmp-Integer-1 := 10
-	Tmp-Integer-1 += 20
-	Tmp-Integer-1 += 30
+	&Tmp-String-0 := 'foo'
+	&Tmp-String-0 += 'bar'
+	&Tmp-String-0 += 'baz'
+
+	&Tmp-String-1 := 'boink'
+	&Tmp-String-1 += 'tard'
+	&Tmp-String-1 += 'dink'
+	&Tmp-String-1 += 'slink'
+
+	&Tmp-Integer-0 := 01
+	&Tmp-Integer-0 += 02
+	&Tmp-Integer-0 += 05
+	&Tmp-Integer-0 += 04
+
+	&Tmp-Integer-1 := 10
+	&Tmp-Integer-1 += 20
+	&Tmp-Integer-1 += 30
 }
 
 #
diff --git a/src/tests/keywords/if-paircmp b/src/tests/keywords/if-paircmp
index 323b36a8b50..60685c7fc48 100644
--- a/src/tests/keywords/if-paircmp
+++ b/src/tests/keywords/if-paircmp
@@ -2,7 +2,7 @@
 # PRE: update if
 #
 update {
-       control:Cleartext-Password := 'hello'
+	&control:Cleartext-Password := 'hello'
 }
 
 #
diff --git a/src/tests/keywords/if-rcode-error b/src/tests/keywords/if-rcode-error
index 0429eb5bbdd..a68ff124be0 100644
--- a/src/tests/keywords/if-rcode-error
+++ b/src/tests/keywords/if-rcode-error
@@ -2,9 +2,9 @@
 #
 #  return code in an "if" section.
 #
-if (User-Name == "bob") {
+if (&User-Name == "bob") {
 	update request {
-	       Proxy-State := 0x01020304
+		&Proxy-State := 0x01020304
 	}
 
 	ok = reject	# ERROR
diff --git a/src/tests/keywords/if-regex-empty b/src/tests/keywords/if-regex-empty
index b34d8a91323..6a3fff577ec 100644
--- a/src/tests/keywords/if-regex-empty
+++ b/src/tests/keywords/if-regex-empty
@@ -2,10 +2,10 @@
 # PRE: update if if-regex-match
 #
 update {
-       control:Cleartext-Password := 'hello'
+       &control:Cleartext-Password := 'hello'
 }
 
-if (control:Cleartext-Password !~ /hell(o)(.*)/) {
+if (&control:Cleartext-Password !~ /hell(o)(.*)/) {
 	test_fail
 }
 
@@ -23,7 +23,7 @@ if ("%{2}") {
 	test_fail
 }
 
-if (control:Cleartext-Password !~ /hello(.*)/) {
+if (&control:Cleartext-Password !~ /hello(.*)/) {
 	test_fail
 }
 
@@ -37,9 +37,9 @@ if ("%{1}") {
 #
 #  Check assignment of regex null-match
 #
-if (control:Cleartext-Password =~ /hell(o)(.*)/) {
+if (&control:Cleartext-Password =~ /hell(o)(.*)/) {
 	update {
-		control:Tmp-String-1 := "%{2}"
+		&control:Tmp-String-1 := "%{2}"
 	}
 }
 
diff --git a/src/tests/keywords/if-regex-match b/src/tests/keywords/if-regex-match
index 0810538d4f0..bae6f509e51 100644
--- a/src/tests/keywords/if-regex-match
+++ b/src/tests/keywords/if-regex-match
@@ -1,11 +1,11 @@
 # PRE: if
 #
 update request {
-	Tmp-Integer-0 := '123456789'
+	&Tmp-Integer-0 := '123456789'
 }
 
 # Non matching on attribute ref
-if (User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
+if (&User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
 	test_fail
 }
 
@@ -15,10 +15,10 @@ if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{T
 }
 
 # Matching on attribute ref with capture groups
-if (User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
+if (&User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
 	# Test all the capture groups
 	update {
-		reply:User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
+		&reply:User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
 	}
 }
 else {
@@ -26,7 +26,7 @@ else {
 }
 
 # Checking capture groups are cleared out correctly
-if (User-Name =~ /^([0-9])_%{Tmp-String-0}/) {
+if (&User-Name =~ /^([0-9])_%{Tmp-String-0}/) {
 	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1_1') {
 		test_fail
 	}
@@ -36,7 +36,7 @@ else {
 }
 
 # Checking capture groups are cleared out correctly when there are no matches
-if (User-Name =~ /^.%{Tmp-String-0}/) {
+if (&User-Name =~ /^.%{Tmp-String-0}/) {
 	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1') {
 		test_fail
 	}
@@ -66,7 +66,7 @@ else {
 }
 
 # uncompiled - ref - insensitive
-if (Calling-Station-Id !~ /:roamyroam%{Tmp-String-0}$/i) {
+if (&Calling-Station-Id !~ /:roamyroam%{Tmp-String-0}$/i) {
 	test_fail
 }
 
@@ -76,7 +76,7 @@ if ("%{Calling-Station-Id}" !~ /:roamyroam%{Tmp-String-0}$/i) {
 }
 
 # uncompiled - enum - ref - insensitive
-if (Service-Type !~ /^framed-user%{Tmp-String-0}$/i) {
+if (&Service-Type !~ /^framed-user%{Tmp-String-0}$/i) {
 	test_fail
 }
 
@@ -86,17 +86,17 @@ if ("%{Service-Type}" !~ /^framed-user%{Tmp-String-0}$/i) {
 }
 
 # uncompiled - enum - ref
-if (Service-Type =~ /^framed-user%{Tmp-String-0}$/) {
+if (&Service-Type =~ /^framed-user%{Tmp-String-0}$/) {
 	test_fail
 }
 
 # uncompiled - integer - ref
-if (Tmp-Integer-0 !~ /%{Tmp-Integer-0}/) {
+if (&Tmp-Integer-0 !~ /%{Tmp-Integer-0}/) {
 	test_fail
 }
 
 update request {
-	Tmp-String-0 := "foo\nbar"
+	&Tmp-String-0 := "foo\nbar"
 }
 
 # uncompiled - ref - multiline
diff --git a/src/tests/keywords/if-regex-match-comp b/src/tests/keywords/if-regex-match-comp
index 5b8db0407f6..60b26cd0730 100644
--- a/src/tests/keywords/if-regex-match-comp
+++ b/src/tests/keywords/if-regex-match-comp
@@ -2,7 +2,7 @@
 #
 
 # Non matching on attribute ref
-if (User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
+if (&User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
 	test_fail
 }
 
@@ -12,10 +12,10 @@ if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/)
 }
 
 # Matching on attribute ref with capture groups
-if (User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
+if (&User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
 	# Test all the capture groups
 	update {
-		reply:User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
+		&reply:User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
 	}
 }
 else {
@@ -23,7 +23,7 @@ else {
 }
 
 # Checking capture groups are cleared out correctly
-if (User-Name =~ /^([0-9])_/) {
+if (&User-Name =~ /^([0-9])_/) {
 	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 =~ /^./) {
+if (&User-Name =~ /^./) {
 	if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1') {
 		test_fail
 	}
@@ -43,7 +43,7 @@ else {
 }
 
 # compiled - ref - insensitive
-if (Calling-Station-Id !~ /:roamyroam$/i) {
+if (&Calling-Station-Id !~ /:roamyroam$/i) {
 	test_fail
 }
 
@@ -53,7 +53,7 @@ if ("%{Calling-Station-Id}" !~ /:roamyroam$/i) {
 }
 
 # compiled - enum - ref - insensitive
-if (Service-Type !~ /^framed-user$/i) {
+if (&Service-Type !~ /^framed-user$/i) {
 	test_fail
 }
 
@@ -63,12 +63,12 @@ if ("%{Service-Type}" !~ /^framed-user$/i) {
 }
 
 # compiled - enum - ref
-if (Service-Type =~ /^framed-user$/) {
+if (&Service-Type =~ /^framed-user$/) {
 	test_fail
 }
 
 update request {
-	Tmp-String-0 := "foo\nbar"
+	&Tmp-String-0 := "foo\nbar"
 }
 
 # compiled - ref - multiline
diff --git a/src/tests/keywords/if-regex-match-named b/src/tests/keywords/if-regex-match-named
index f9f31648b40..727f6554584 100644
--- a/src/tests/keywords/if-regex-match-named
+++ b/src/tests/keywords/if-regex-match-named
@@ -2,13 +2,13 @@
 #
 if ('${feature.regex-pcre}' == 'yes') {
 update request {
-	Tmp-Integer-0 := '123456789'
+	&Tmp-Integer-0 := '123456789'
 }
 
 # 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}/) {
+if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])%{Tmp-String-1}/) {
 	update request {
-		Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}"
+		&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') {
 		test_fail
@@ -19,9 +19,9 @@ else {
 }
 
 # Checking capture groups are cleared out correctly
-if (User-Name =~ /^(?<one>[0-9])_%{Tmp-String-1}/) {
+if (&User-Name =~ /^(?<one>[0-9])_%{Tmp-String-1}/) {
 	update request {
-		Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}"
+		&Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}"
 	}
 	if (&Tmp-String-0 != '1_1') {
 		test_fail
@@ -32,9 +32,9 @@ else {
 }
 
 # Checking capture groups are cleared out correctly when there are no matches
-if (User-Name =~ /^.%{Tmp-String-1}/) {
+if (&User-Name =~ /^.%{Tmp-String-1}/) {
 	update request {
-		Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}"
+		&Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}"
 	}
 	if (&Tmp-String-0 != '1') {
 		test_fail
@@ -45,9 +45,9 @@ 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])/) {
+if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
 	update request {
-		Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}"
+		&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') {
 		test_fail
@@ -60,7 +60,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])/) {
 	update request {
-		Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}"
+		&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') {
 		test_fail
@@ -71,9 +71,9 @@ 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])/) {
+if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
 	update request {
-		Tmp-String-0 := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
+		&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') {
 		test_fail
@@ -85,19 +85,19 @@ else {
 }
 
 # compiled - ref - named capture groups (numeric indexes using expansion)
-if (User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
+if (&User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
 	update request {
-		Tmp-Integer-0 := 0
-		Tmp-Integer-1 := 1
-		Tmp-Integer-2 := 2
-		Tmp-Integer-3 := 3
-		Tmp-Integer-4 := 4
-		Tmp-Integer-5 := 5
-		Tmp-Integer-6 := 6
-		Tmp-Integer-7 := 7
+		&Tmp-Integer-0 := 0
+		&Tmp-Integer-1 := 1
+		&Tmp-Integer-2 := 2
+		&Tmp-Integer-3 := 3
+		&Tmp-Integer-4 := 4
+		&Tmp-Integer-5 := 5
+		&Tmp-Integer-6 := 6
+		&Tmp-Integer-7 := 7
 	}
 	update request {
-		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}}"
+		&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') {
 		test_fail
diff --git a/src/tests/keywords/if-regex-multivalue b/src/tests/keywords/if-regex-multivalue
index d716bae5c39..48c038acef0 100644
--- a/src/tests/keywords/if-regex-multivalue
+++ b/src/tests/keywords/if-regex-multivalue
@@ -2,13 +2,13 @@
 # PRE: update if
 #
 update {
-       control:Cleartext-Password := 'hello'
+       &control:Cleartext-Password := 'hello'
 }
 
 update request {
-	Cisco-AVPair := 'foo=bar'
-	Cisco-AVPair += 'bar=baz'
-	Cisco-AVPair += 'baz=foo'
+	&Cisco-AVPair := 'foo=bar'
+	&Cisco-AVPair += 'bar=baz'
+	&Cisco-AVPair += 'baz=foo'
 }
 
 if (&Cisco-AVPair[*] =~ /bar=(.*)/) {
diff --git a/src/tests/keywords/integer-overflow-error b/src/tests/keywords/integer-overflow-error
index b88cc0e19e5..9246ef61b3d 100644
--- a/src/tests/keywords/integer-overflow-error
+++ b/src/tests/keywords/integer-overflow-error
@@ -2,5 +2,5 @@
 # PRE: xlat-integer
 #
 
-if (NAS-Port == 4294967298) { # ERROR
+if (&NAS-Port == 4294967298) { # ERROR
 }
diff --git a/src/tests/keywords/ipaddr b/src/tests/keywords/ipaddr
index 1b3cf363c6b..f6500295727 100644
--- a/src/tests/keywords/ipaddr
+++ b/src/tests/keywords/ipaddr
@@ -2,40 +2,40 @@
 #  PRE: update if
 #
 update control {
-       Cleartext-Password := 'hello'
+       &Cleartext-Password := 'hello'
 }
 
 update request {
 	# Dotted Quad
-	Tmp-IP-Address-0 := 127.0.0.1
+	&Tmp-IP-Address-0 := 127.0.0.1
 
 	# Dotted Quad with prefix
-	Tmp-IP-Address-1 := 127.0.0.2/32
+	&Tmp-IP-Address-1 := 127.0.0.2/32
 
 	# Hex (0x)
-	Tmp-IP-Address-2 := 0x7f000003
+	&Tmp-IP-Address-2 := 0x7f000003
 
 	# Decimal
-	Tmp-IP-Address-3 := 2130706436
+	&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 a65daa3c8a0..6e00b7a514a 100644
--- a/src/tests/keywords/ipaddr.raw
+++ b/src/tests/keywords/ipaddr.raw
@@ -2,25 +2,25 @@
 #  PRE: update if
 #
 update control {
-       Cleartext-Password := 'hello'
+       &Cleartext-Password := 'hello'
 }
 
 #
 #  Malformed NAS-IP-Address
 #
 update request {
-	Attr-4 = 0x010203
+	&Attr-4 = 0x010203
 }
 
 if (!&Attr-4) {
 	update reply {
-		Filter-Id := "Cannot find newly added raw attribute"
+		&Filter-Id := "Cannot find newly added raw attribute"
 	}
 }
 else {
 	if (&Attr-4 != 0x010203) {
 		update reply {
-			Filter-Id := "Attr-4 is not 0x0120203"
+			&Filter-Id := "Attr-4 is not 0x0120203"
 		}
 	}
 }
diff --git a/src/tests/keywords/ipprefix b/src/tests/keywords/ipprefix
index 9576869ecbe..4eaabcf3de5 100644
--- a/src/tests/keywords/ipprefix
+++ b/src/tests/keywords/ipprefix
@@ -2,13 +2,13 @@
 #  PRE: update if
 #
 update control {
-       Cleartext-Password := 'hello'
+       &Cleartext-Password := 'hello'
 }
 
 update control {
-	Tmp-Cast-IPv4Prefix := 198.51.100.255/16
-	Tmp-Cast-IPv6Prefix := ::198.51.100.255/112
-	Framed-IP-Address := 198.51.0.1
+	&Tmp-Cast-IPv4Prefix := 198.51.100.255/16
+	&Tmp-Cast-IPv6Prefix := ::198.51.100.255/112
+	&Framed-IP-Address := 198.51.0.1
 }
 
 if ("%{control:Tmp-Cast-IPv6Prefix}" != '::198.51.0.0/112') {
@@ -19,11 +19,11 @@ 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 28e2690cef8..020c3f8371c 100644
--- a/src/tests/keywords/length
+++ b/src/tests/keywords/length
@@ -2,121 +2,121 @@
 # PRE: hex
 #
 update request {
-	Tmp-String-0        := '\
+	&Tmp-String-0        := '\
 abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\
 abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\
 abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
-	Tmp-String-2        := '9870'
-	Tmp-Octets-0        := 0x39383731
-	Tmp-IP-Address-0    := 57.56.55.50
-	Tmp-Date-0          := 959985459
-	Tmp-Integer-0       := 959985460
-	Tmp-Cast-Abinary    := 'ip out forward srcip 57.56.55.53/32 udp dstport = 1812'
-	Tmp-Cast-IfId       := '0000:0000:3938:3737'
-	Tmp-Cast-IPv6Addr   := '::3938:3738'
-	Tmp-Cast-IPv6Prefix := '::3938:3739/128'
-	Tmp-Cast-Byte       := 58
-	Tmp-Cast-Short      := 14139
-	Tmp-Cast-Ether   := 00:00:39:38:37:3c
-	Tmp-Cast-Integer64  := 1152921505566832445
-	Tmp-Cast-IPv4Prefix := 57.56.55.62/32
+	&Tmp-String-2        := '9870'
+	&Tmp-Octets-0        := 0x39383731
+	&Tmp-IP-Address-0    := 57.56.55.50
+	&Tmp-Date-0          := 959985459
+	&Tmp-Integer-0       := 959985460
+	&Tmp-Cast-Abinary    := 'ip out forward srcip 57.56.55.53/32 udp dstport = 1812'
+	&Tmp-Cast-IfId       := '0000:0000:3938:3737'
+	&Tmp-Cast-IPv6Addr   := '::3938:3738'
+	&Tmp-Cast-IPv6Prefix := '::3938:3739/128'
+	&Tmp-Cast-Byte       := 58
+	&Tmp-Cast-Short      := 14139
+	&Tmp-Cast-Ether   := 00:00:39:38:37:3c
+	&Tmp-Cast-Integer64  := 1152921505566832445
+	&Tmp-Cast-IPv4Prefix := 57.56.55.62/32
 }
 
 update request {
-	Tmp-Integer-0        := "%{length:Tmp-String-0}"
+	&Tmp-Integer-0        := "%{length:&Tmp-String-0}"
 }
 
-if (Tmp-Integer-0 != 260) {
+if (&Tmp-Integer-0 != 260) {
 	test_fail
 }
 
 update request {
-	Tmp-Integer-0        := "%{length:Tmp-String-2}"
-	Tmp-Integer-1        := "%{length:Tmp-Octets-0}"
-	Tmp-Integer-2        := "%{length:Tmp-IP-Address-0}"
-	Tmp-Integer-3        := "%{length:Tmp-Date-0}"
-	Tmp-Integer-4        := "%{length:Tmp-Integer-0}"
-	Tmp-Integer-5        := "%{length:Tmp-Cast-Abinary}"
-	Tmp-Integer-6        := "%{length:Tmp-Cast-Ifid}"
-	Tmp-Integer-7        := "%{length:Tmp-Cast-IPv6Addr}"
-	Tmp-Integer-8        := "%{length:Tmp-Cast-IPv6Prefix}"
-	Tmp-Integer-9        := "%{length:Tmp-Cast-Byte}"
+	&Tmp-Integer-0        := "%{length:&Tmp-String-2}"
+	&Tmp-Integer-1        := "%{length:&Tmp-Octets-0}"
+	&Tmp-Integer-2        := "%{length:&Tmp-IP-Address-0}"
+	&Tmp-Integer-3        := "%{length:&Tmp-Date-0}"
+	&Tmp-Integer-4        := "%{length:&Tmp-Integer-0}"
+	&Tmp-Integer-5        := "%{length:&Tmp-Cast-Abinary}"
+	&Tmp-Integer-6        := "%{length:&Tmp-Cast-Ifid}"
+	&Tmp-Integer-7        := "%{length:&Tmp-Cast-IPv6Addr}"
+	&Tmp-Integer-8        := "%{length:&Tmp-Cast-IPv6Prefix}"
+	&Tmp-Integer-9        := "%{length:&Tmp-Cast-Byte}"
 }
 
 # String - bin 0x39383730
-if (Tmp-Integer-0 != 4) {
+if (&Tmp-Integer-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
 }
 
 # Date - bin 0x39383733
-if (Tmp-Integer-3 != 4) {
+if (&Tmp-Integer-3 != 4) {
 	test_fail
 }
 
 # Integer - bin 0x39383734
-if (Tmp-Integer-4 != 4) {
+if (&Tmp-Integer-4 != 4) {
 	test_fail
 }
 
 # Abinary - bin 0x0101000039383735000000002000110000000714000200000000000000000000
-if (Tmp-Integer-5 != 32) {
+if (&Tmp-Integer-5 != 32) {
 	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
 }
 
 update request {
-	Tmp-Integer-0        := "%{length:Tmp-Cast-Short}"
-	Tmp-Integer-1        := "%{length:Tmp-Cast-Ether}"
-	Tmp-Integer-2        := "%{length:Tmp-Cast-Integer64}"
-	Tmp-Integer-3        := "%{length:Tmp-Cast-IPv4Prefix}"
+	&Tmp-Integer-0        := "%{length:&Tmp-Cast-Short}"
+	&Tmp-Integer-1        := "%{length:&Tmp-Cast-Ether}"
+	&Tmp-Integer-2        := "%{length:&Tmp-Cast-Integer64}"
+	&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/list-existence b/src/tests/keywords/list-existence
index 2e999bb79d7..91afa817a70 100644
--- a/src/tests/keywords/list-existence
+++ b/src/tests/keywords/list-existence
@@ -11,7 +11,7 @@ if (&session-state) {
 }
 
 update session-state {
-	User-Name := 'foo'
+	&User-Name := 'foo'
 }
 
 if (!&session-state) {
diff --git a/src/tests/keywords/load-balance b/src/tests/keywords/load-balance
index 72e08e76dfa..ecea871e9f8 100644
--- a/src/tests/keywords/load-balance
+++ b/src/tests/keywords/load-balance
@@ -5,59 +5,59 @@
 #  Should distribute load between the modules.
 #
 update request {
-    Tmp-Integer-0 := 0
-    Tmp-Integer-1 := 0
+    &Tmp-Integer-0 := 0
+    &Tmp-Integer-1 := 0
 
-    Tmp-Integer-2 += 0		# 0
-    Tmp-Integer-2 += 1
-    Tmp-Integer-2 += 2
-    Tmp-Integer-2 += 3
-    Tmp-Integer-2 += 4
-    Tmp-Integer-2 += 5
-    Tmp-Integer-2 += 6
-    Tmp-Integer-2 += 7
-    Tmp-Integer-2 += 8
-    Tmp-Integer-2 += 9		# 10
-    Tmp-Integer-2 += 0
-    Tmp-Integer-2 += 1
-    Tmp-Integer-2 += 2
-    Tmp-Integer-2 += 3
-    Tmp-Integer-2 += 4
-    Tmp-Integer-2 += 5
-    Tmp-Integer-2 += 6
-    Tmp-Integer-2 += 7
-    Tmp-Integer-2 += 8
-    Tmp-Integer-2 += 9		# 20
-    Tmp-Integer-2 += 0
-    Tmp-Integer-2 += 1
-    Tmp-Integer-2 += 2
-    Tmp-Integer-2 += 3
-    Tmp-Integer-2 += 4
-    Tmp-Integer-2 += 5
-    Tmp-Integer-2 += 6
-    Tmp-Integer-2 += 7
-    Tmp-Integer-2 += 8
-    Tmp-Integer-2 += 9		# 30
-    Tmp-Integer-2 += 0
-    Tmp-Integer-2 += 1
-    Tmp-Integer-2 += 2
-    Tmp-Integer-2 += 3
-    Tmp-Integer-2 += 4
-    Tmp-Integer-2 += 5
-    Tmp-Integer-2 += 6
-    Tmp-Integer-2 += 7
-    Tmp-Integer-2 += 8
-    Tmp-Integer-2 += 9		# 40
-    Tmp-Integer-2 += 0
-    Tmp-Integer-2 += 1
-    Tmp-Integer-2 += 2
-    Tmp-Integer-2 += 3
-    Tmp-Integer-2 += 4
-    Tmp-Integer-2 += 5
-    Tmp-Integer-2 += 6
-    Tmp-Integer-2 += 7
-    Tmp-Integer-2 += 8
-    Tmp-Integer-2 += 9		# 49
+    &Tmp-Integer-2 += 0		# 0
+    &Tmp-Integer-2 += 1
+    &Tmp-Integer-2 += 2
+    &Tmp-Integer-2 += 3
+    &Tmp-Integer-2 += 4
+    &Tmp-Integer-2 += 5
+    &Tmp-Integer-2 += 6
+    &Tmp-Integer-2 += 7
+    &Tmp-Integer-2 += 8
+    &Tmp-Integer-2 += 9		# 10
+    &Tmp-Integer-2 += 0
+    &Tmp-Integer-2 += 1
+    &Tmp-Integer-2 += 2
+    &Tmp-Integer-2 += 3
+    &Tmp-Integer-2 += 4
+    &Tmp-Integer-2 += 5
+    &Tmp-Integer-2 += 6
+    &Tmp-Integer-2 += 7
+    &Tmp-Integer-2 += 8
+    &Tmp-Integer-2 += 9		# 20
+    &Tmp-Integer-2 += 0
+    &Tmp-Integer-2 += 1
+    &Tmp-Integer-2 += 2
+    &Tmp-Integer-2 += 3
+    &Tmp-Integer-2 += 4
+    &Tmp-Integer-2 += 5
+    &Tmp-Integer-2 += 6
+    &Tmp-Integer-2 += 7
+    &Tmp-Integer-2 += 8
+    &Tmp-Integer-2 += 9		# 30
+    &Tmp-Integer-2 += 0
+    &Tmp-Integer-2 += 1
+    &Tmp-Integer-2 += 2
+    &Tmp-Integer-2 += 3
+    &Tmp-Integer-2 += 4
+    &Tmp-Integer-2 += 5
+    &Tmp-Integer-2 += 6
+    &Tmp-Integer-2 += 7
+    &Tmp-Integer-2 += 8
+    &Tmp-Integer-2 += 9		# 40
+    &Tmp-Integer-2 += 0
+    &Tmp-Integer-2 += 1
+    &Tmp-Integer-2 += 2
+    &Tmp-Integer-2 += 3
+    &Tmp-Integer-2 += 4
+    &Tmp-Integer-2 += 5
+    &Tmp-Integer-2 += 6
+    &Tmp-Integer-2 += 7
+    &Tmp-Integer-2 += 8
+    &Tmp-Integer-2 += 9		# 49
 }
 
 #
@@ -67,15 +67,15 @@ foreach &Tmp-Integer-2 {
 	load-balance {
 		group {
 			update request {
-				Tmp-Integer-0 := "%{expr:%{Tmp-Integer-0} + 1}"
-				Filter-Id += "PICKED GROUP 1 %{Tmp-Integer-0} TIME(S)"
+				&Tmp-Integer-0 := "%{expr:%{Tmp-Integer-0} + 1}"
+				&Filter-Id += "PICKED GROUP 1 %{Tmp-Integer-0} TIME(S)"
 			}
 			ok
 		}
 		group {
 			update request {
-				Tmp-Integer-1 := "%{expr:%{Tmp-Integer-1} + 1}"
-				Filter-Id += "PICKED GROUP 2 %{Tmp-Integer-1} TIME(S)"
+				&Tmp-Integer-1 := "%{expr:%{Tmp-Integer-1} + 1}"
+				&Filter-Id += "PICKED GROUP 2 %{Tmp-Integer-1} TIME(S)"
 			}
 			ok
 		}
diff --git a/src/tests/keywords/log b/src/tests/keywords/log
index afc589a6375..b1897aac16d 100644
--- a/src/tests/keywords/log
+++ b/src/tests/keywords/log
@@ -1,5 +1,5 @@
 update control {
-       Cleartext-Password := 'hello'
+       &Cleartext-Password := 'hello'
 }
 
 success
diff --git a/src/tests/keywords/map b/src/tests/keywords/map
index 8a817d2b45e..7b3bc31f30d 100644
--- a/src/tests/keywords/map
+++ b/src/tests/keywords/map
@@ -2,5 +2,5 @@
 #  PRE: map-2arg-error map-empty-error map-module-error map-field-error
 #
 map csv &User-Name {
-    reply:Filter-Id := 'field3'
+	&reply:Filter-Id := 'field3'
 }
diff --git a/src/tests/keywords/map-arg3-xlat b/src/tests/keywords/map-arg3-xlat
index cbccb059e69..17295b2e9e4 100644
--- a/src/tests/keywords/map-arg3-xlat
+++ b/src/tests/keywords/map-arg3-xlat
@@ -8,5 +8,5 @@
 #  arg3 can be an xlat
 #
 map csv "%{tolower:%{User-Name}}" {
-    reply:Filter-Id := 'field3'
+	&reply:Filter-Id := 'field3'
 }
diff --git a/src/tests/keywords/map-module-error b/src/tests/keywords/map-module-error
index 12f71bf60b1..2b2872868a9 100644
--- a/src/tests/keywords/map-module-error
+++ b/src/tests/keywords/map-module-error
@@ -2,5 +2,5 @@
 #  PRE: map-2arg-error
 #
 map foo "bar" {		# ERROR
-    User-Name = 'foo'
+	&User-Name = 'foo'
 }
diff --git a/src/tests/keywords/xlat-integer b/src/tests/keywords/xlat-integer
index 62ca51fcbc0..72b199282cc 100644
--- a/src/tests/keywords/xlat-integer
+++ b/src/tests/keywords/xlat-integer
@@ -2,151 +2,151 @@
 # PRE: update
 #
 update request {
-	Tmp-String-0        := '9870'
-	Tmp-String-1        := '98709870'
-	Tmp-String-2        := '184467440737095516157'
-	Tmp-Octets-0        := 0x39383731
-	Tmp-Octets-1        := 0x3938373139383731
-	Tmp-Octets-2        := 0x393837313938373139383731
-	Tmp-IP-Address-0    := 57.56.55.50
-	Tmp-Date-0          := 959985459
-	Tmp-Integer-0       := 959985460
-	Tmp-Cast-Abinary    := 'ip out forward srcip 57.56.55.53/32 udp dstport = 1812'
-	Tmp-Cast-IfId       := '0000:0000:3938:3737'
-	Tmp-Cast-IPv6Addr   := '::3938:3738'
-	Tmp-Cast-IPv6Prefix := '::3938:3739/128'
-	Tmp-Cast-Byte       := 58
-	Tmp-Cast-Short      := 14139
-	Tmp-Cast-Ether      := 00:00:39:38:37:3c
-	Tmp-Cast-Integer64  := 1152921505566832445
-	Tmp-Cast-IPv4Prefix := 57.56.55.62/32
+	&Tmp-String-0        := '9870'
+	&Tmp-String-1        := '98709870'
+	&Tmp-String-2        := '184467440737095516157'
+	&Tmp-Octets-0        := 0x39383731
+	&Tmp-Octets-1        := 0x3938373139383731
+	&Tmp-Octets-2        := 0x393837313938373139383731
+	&Tmp-IP-Address-0    := 57.56.55.50
+	&Tmp-Date-0          := 959985459
+	&Tmp-Integer-0       := 959985460
+	&Tmp-Cast-Abinary    := 'ip out forward srcip 57.56.55.53/32 udp dstport = 1812'
+	&Tmp-Cast-IfId       := '0000:0000:3938:3737'
+	&Tmp-Cast-IPv6Addr   := '::3938:3738'
+	&Tmp-Cast-IPv6Prefix := '::3938:3739/128'
+	&Tmp-Cast-Byte       := 58
+	&Tmp-Cast-Short      := 14139
+	&Tmp-Cast-Ether      := 00:00:39:38:37:3c
+	&Tmp-Cast-Integer64  := 1152921505566832445
+	&Tmp-Cast-IPv4Prefix := 57.56.55.62/32
 }
 
 # String - network order representation of a 4 char string
 update request {
-	Tmp-Integer-1 := "%{integer:Tmp-String-0}"
+	&Tmp-Integer-1 := "%{integer:&Tmp-String-0}"
 }
-if ((<integer>&Tmp-String-0 != &Tmp-Integer-1) || (Tmp-Integer-1 != 9870)) {
+if ((<integer>&Tmp-String-0 != &Tmp-Integer-1) || (&Tmp-Integer-1 != 9870)) {
 	test_fail
 }
 
 # String - network order representation of a 8 char string
 update request {
-	Tmp-Integer64-0 := "%{integer:Tmp-String-1}"
+	&Tmp-Integer64-0 := "%{integer:&Tmp-String-1}"
 }
 if ((<integer64>&Tmp-String-1 != &Tmp-Integer64-0) || (&Tmp-Integer64-0 != 98709870)) {
 	test_fail
 }
 
 # String - Can't convert 12 byte string to integer (our biggest native size is a 64bit unsigned int)
-if ("%{integer:Tmp-String-2}" != '') {
+if ("%{integer:&Tmp-String-2}" != '') {
 	test_fail
 }
 
 # Octets - network order representation of a 4 byte octet string
 update request {
-	Tmp-Integer-1 := "%{integer:Tmp-Octets-0}"
+	&Tmp-Integer-1 := "%{integer:&Tmp-Octets-0}"
 }
 
 #
 #  Disabled until xlats can return binary data
 #
-#if (Tmp-Octets-0 != "%{hex:Tmp-Integer-1}") {
+#if (&Tmp-Octets-0 != "%{hex:Tmp-Integer-1}") {
 #	test_fail
 #}
-if (Tmp-Integer-1 != 959985457) {
+if (&Tmp-Integer-1 != 959985457) {
 	test_fail
 }
 
 # Octets - network order representation of a 8 byte octet string
 update request {
-	Tmp-Integer64-0 := "%{integer:Tmp-Octets-1}"
+	&Tmp-Integer64-0 := "%{integer:&Tmp-Octets-1}"
 }
 
 #
 #  Disabled until xlats can return binary data
 #
-#if (Tmp-Octets-1 != "%{hex:Tmp-Integer64-0}") {
+#if (&Tmp-Octets-1 != "%{hex:Tmp-Integer64-0}") {
 #	test_fail
 #}
 
-if (Tmp-Integer64-0 != 4123106143410599729) {
+if (&Tmp-Integer64-0 != 4123106143410599729) {
 	test_fail
 }
 
 # String - Can't convert 12 byte octet string to integer (our biggest native size is a 64bit unsigned int)
-if ("%{integer:Tmp-Octets-2}" != '') {
+if ("%{integer:&Tmp-Octets-2}" != '') {
 	test_fail
 }
 
 update request {
-	Tmp-String-2        := "%{integer:Tmp-IP-Address-0}"
-	Tmp-String-3        := "%{integer:Tmp-Date-0}"
-	Tmp-String-4        := "%{integer:Tmp-Integer-0}"
-	Tmp-String-5        := "%{integer:Tmp-Cast-Abinary}"
-	Tmp-String-6        := "%{integer:Tmp-Cast-Ifid}"
-	Tmp-String-7        := "%{integer:Tmp-Cast-IPv6Addr}"
-	Tmp-String-8        := "%{integer:Tmp-Cast-IPv6Prefix}"
+	&Tmp-String-2        := "%{integer:&Tmp-IP-Address-0}"
+	&Tmp-String-3        := "%{integer:&Tmp-Date-0}"
+	&Tmp-String-4        := "%{integer:&Tmp-Integer-0}"
+	&Tmp-String-5        := "%{integer:&Tmp-Cast-Abinary}"
+	&Tmp-String-6        := "%{integer:&Tmp-Cast-Ifid}"
+	&Tmp-String-7        := "%{integer:&Tmp-Cast-IPv6Addr}"
+	&Tmp-String-8        := "%{integer:&Tmp-Cast-IPv6Prefix}"
 }
 
 # IP Address
-if (Tmp-String-2 != '959985458') {
+if (&Tmp-String-2 != '959985458') {
 	test_fail
 }
 
-if (<ipaddr>Tmp-String-2 != &Tmp-IP-Address-0) {
+if (<ipaddr>&Tmp-String-2 != &Tmp-IP-Address-0) {
 	test_fail
 }
 
 # Date
-if (Tmp-String-3 != '959985459') {
+if (&Tmp-String-3 != '959985459') {
 	test_fail
 }
 
 # Integer
-if (Tmp-String-4 != '959985460') {
+if (&Tmp-String-4 != '959985460') {
 	test_fail
 }
 
 # Abinary - Can't convert ascend binary to an integer
-if (Tmp-String-5 != '') {
+if (&Tmp-String-5 != '') {
 	test_fail
 }
 
 # ifid - Can't convert interface ID to an integer
-if (Tmp-String-6 != '') {
+if (&Tmp-String-6 != '') {
 	test_fail
 }
 
 # ipv6addr - Can't convert IPv6 to integer
-if (Tmp-String-7 != '959985464') {
+if (&Tmp-String-7 != '959985464') {
 	test_fail
 }
 
 # ipv6addrprefix
-if (Tmp-String-8 != '959985465') {
+if (&Tmp-String-8 != '959985465') {
 	test_fail
 }
 update request {
-	Tmp-String-0        := "%{integer:Tmp-Cast-Byte}"
-	Tmp-String-1        := "%{integer:Tmp-Cast-Short}"
-	Tmp-Integer64-2     := "%{integer:Tmp-Cast-Ether}"
-	Tmp-String-3        := "%{integer:Tmp-Cast-Integer64}"
-	Tmp-String-4        := "%{integer:Tmp-Cast-IPv4Prefix}"
+	&Tmp-String-0        := "%{integer:&Tmp-Cast-Byte}"
+	&Tmp-String-1        := "%{integer:&Tmp-Cast-Short}"
+	&Tmp-Integer64-2     := "%{integer:&Tmp-Cast-Ether}"
+	&Tmp-String-3        := "%{integer:&Tmp-Cast-Integer64}"
+	&Tmp-String-4        := "%{integer:&Tmp-Cast-IPv4Prefix}"
 }
 
 # byte
-if (Tmp-String-0 != '58') {
+if (&Tmp-String-0 != '58') {
 	test_fail
 }
 
 # short
-if (Tmp-String-1 != '14139') {
+if (&Tmp-String-1 != '14139') {
 	test_fail
 }
 
 # ethernet
-if (Tmp-Integer64-2 != 959985468) {
+if (&Tmp-Integer64-2 != 959985468) {
 	test_fail
 }
 
@@ -155,17 +155,17 @@ if (Tmp-Integer64-2 != 959985468) {
 #  with the lowest octet of the integer mapping to the right-most
 #  ethernet octet (in network order)
 #
-if (<ether>Tmp-Integer64-2 != &Tmp-Cast-Ether) {
+if (<ether>&Tmp-Integer64-2 != &Tmp-Cast-Ether) {
 	test_fail
 }
 
 # integer64
-if (Tmp-String-3 != '1152921505566832445') {
+if (&Tmp-String-3 != '1152921505566832445') {
 	test_fail
 }
 
 # ipv4prefix
-if (Tmp-String-4 != '959985470') {
+if (&Tmp-String-4 != '959985470') {
 	test_fail
 }