diff --git a/test/maketests.com b/test/maketests.com
index 37ecf87f8..9842381c9 100644
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -138,7 +138,9 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
 	       "MDC2TEST,RMDTEST,"+ -
 	       "RANDTEST,DHTEST,ENGINETEST,"+ -
 	       "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
-	       "EVP_TEST"
+	       "EVP_TEST,JPAKETEST"
+$! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
+$
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",SSLTEST,"
@@ -199,7 +201,9 @@ $!
 $! Compile The File.
 $!
 $ ON ERROR THEN GOTO NEXT_FILE
-$ CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
+$ CC/OBJECT='OBJECT_FILE' /PREFIX=ALL -
+    /INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO],SYS$DISK:[-.CRYPTO.X509V3],SYS$DISK:[-.INCLUDE.OPENSSL]) - 
+    'SOURCE_FILE'
 $ ON WARNING THEN GOTO NEXT_FILE
 $!
 $! Check If What We Are About To Compile Works Without A TCP/IP Library.
diff --git a/test/tcrl.com b/test/tcrl.com
index 485670956..1f606eb85 100644
--- a/test/tcrl.com
+++ b/test/tcrl.com
@@ -2,7 +2,7 @@ $! TCRL.COM  --  Tests crl keys
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
diff --git a/test/testca.com b/test/testca.com
index c4a5af79e..89922c2ac 100644
--- a/test/testca.com
+++ b/test/testca.com
@@ -2,7 +2,7 @@ $! TESTCA.COM
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $
 $	openssl := mcr 'exe_dir'openssl
diff --git a/test/testenc.com b/test/testenc.com
index 4a46ce9f0..621d9a212 100644
--- a/test/testenc.com
+++ b/test/testenc.com
@@ -2,7 +2,7 @@ $! TESTENC.COM  --  Test encoding and decoding
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $
 $	testsrc := makefile.
diff --git a/test/testgen.com b/test/testgen.com
index ee62c4c1b..a4bc574be 100644
--- a/test/testgen.com
+++ b/test/testgen.com
@@ -2,8 +2,9 @@ $! TETSGEN.COM
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
+$	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
 $	T := testcert
 $	KEY = 512
diff --git a/test/tests.com b/test/tests.com
index 5a863a621..a5d5992d5 100644
--- a/test/tests.com
+++ b/test/tests.com
@@ -7,12 +7,13 @@ $	__here = f$parse(f$parse("A.;",__proc) - "A.;","[]A.;") - "A.;"
 $	__save_default = f$environment("default")
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	texe_dir := sys$disk:[-.'__arch'.exe.test]
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
 $	set default '__here'
+$
 $	on control_y then goto exit
 $	on error then goto exit
 $
diff --git a/test/testss.com b/test/testss.com
index 6b31f72c3..6598106b0 100644
--- a/test/testss.com
+++ b/test/testss.com
@@ -2,7 +2,7 @@ $! TESTSS.COM
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
diff --git a/test/testssl.com b/test/testssl.com
index b79d470a1..9c83afba0 100644
--- a/test/testssl.com
+++ b/test/testssl.com
@@ -2,7 +2,7 @@ $! TESTSSL.COM
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	texe_dir := sys$disk:[-.'__arch'.exe.test]
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
diff --git a/test/tpkcs7.com b/test/tpkcs7.com
index 31a86d3cd..e107cc141 100644
--- a/test/tpkcs7.com
+++ b/test/tpkcs7.com
@@ -2,7 +2,7 @@ $! TPKCS7.COM  --  Tests pkcs7 keys
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
diff --git a/test/tpkcs7d.com b/test/tpkcs7d.com
index 22f0d0b2c..5ff653cce 100644
--- a/test/tpkcs7d.com
+++ b/test/tpkcs7d.com
@@ -2,7 +2,7 @@ $! TPKCS7.COM  --  Tests pkcs7 keys
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
diff --git a/test/treq.com b/test/treq.com
index 7b9cb9897..d2594be6a 100644
--- a/test/treq.com
+++ b/test/treq.com
@@ -2,7 +2,7 @@ $! TREQ.COM  --  Tests req keys
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
diff --git a/test/trsa.com b/test/trsa.com
index aa15c4726..d3a8a605b 100644
--- a/test/trsa.com
+++ b/test/trsa.com
@@ -2,7 +2,7 @@ $! TRSA.COM  --  Tests rsa keys
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
diff --git a/test/tsid.com b/test/tsid.com
index e4316b966..267ace113 100644
--- a/test/tsid.com
+++ b/test/tsid.com
@@ -2,7 +2,7 @@ $! TSID.COM  --  Tests sid keys
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
diff --git a/test/tverify.com b/test/tverify.com
index 2c5f25a97..01431f4aa 100644
--- a/test/tverify.com
+++ b/test/tverify.com
@@ -2,7 +2,7 @@ $! TVERIFY.COM
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $!
 $	line_max = 255 ! Could be longer on modern non-VAX.
diff --git a/test/tx509.com b/test/tx509.com
index cd23a354f..399eb0149 100644
--- a/test/tx509.com
+++ b/test/tx509.com
@@ -2,7 +2,7 @@ $! TX509.COM  --  Tests x509 certificates
 $
 $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then -
-	   __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+	   __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $	if __arch .eqs. "" then __arch := UNK
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $