diff -ru test/disable_both/expected/00040_e_iq_types_null_key.out test/disable_both/results/00040_e_iq_types_null_key.out
--- test/disable_both/expected/00040_e_iq_types_null_key.out	2025-05-29 15:24:46.608723804 -0500
+++ test/disable_both/results/00040_e_iq_types_null_key.out	2025-05-29 15:24:49.492723623 -0500
@@ -1,5 +1,5 @@
 -- Test that a null key rasies an error
 INSERT INTO iq_types (iqtype, description)
        VALUES(NULL, 'Sample IQ type #1');
-ERROR:  null value in column "iqtype" of relation "iq_types" violates not-null constraint
+ERROR:  null value in column "iqtype" violates not-null constraint
 DETAIL:  Failing row contains (null, Sample IQ type #1).
diff -ru test/disable_both/expected/00050_e_iq_types_null_description.out test/disable_both/results/00050_e_iq_types_null_description.out
--- test/disable_both/expected/00050_e_iq_types_null_description.out	2025-05-29 15:24:46.608723804 -0500
+++ test/disable_both/results/00050_e_iq_types_null_description.out	2025-05-29 15:24:49.524723622 -0500
@@ -1,5 +1,5 @@
 -- Test that a null description rasies an error
 INSERT INTO iq_types (iqtype, description)
        VALUES('validkey', NULL);
-ERROR:  null value in column "description" of relation "iq_types" violates not-null constraint
+ERROR:  null value in column "description" violates not-null constraint
 DETAIL:  Failing row contains (validkey, null).
diff -ru test/disable_both/expected/00520_e_isok_queries_null_key.out test/disable_both/results/00520_e_isok_queries_null_key.out
--- test/disable_both/expected/00520_e_isok_queries_null_key.out	2025-05-29 15:24:46.608723804 -0500
+++ test/disable_both/results/00520_e_isok_queries_null_key.out	2025-05-29 15:24:49.932723595 -0500
@@ -14,6 +14,6 @@
                 , ('R3', 'Result number 3', NULL);$$
        , 'No comment'
        );
-ERROR:  null value in column "iqname" of relation "isok_queries" violates not-null constraint
+ERROR:  null value in column "iqname" violates not-null constraint
 DETAIL:  Failing row contains (null, f, type1, f, null, null, null, null, VALUES ('R1', 'Result number 1', NULL)
                 , ('R2', ..., No comment).
diff -ru test/disable_both/expected/00560_e_isok_queries_error_null.out test/disable_both/results/00560_e_isok_queries_error_null.out
--- test/disable_both/expected/00560_e_isok_queries_error_null.out	2025-05-29 15:24:46.608723804 -0500
+++ test/disable_both/results/00560_e_isok_queries_error_null.out	2025-05-29 15:24:50.040723589 -0500
@@ -14,6 +14,6 @@
                 , ('R6', 'Result number 6', NULL);$$
        , 'No comment'
        );
-ERROR:  null value in column "error" of relation "isok_queries" violates not-null constraint
+ERROR:  null value in column "error" violates not-null constraint
 DETAIL:  Failing row contains (query2, null, type1, f, null, null, null, null, VALUES ('R4', 'Result number 4', NULL)
                 , ('R5', ..., No comment).
diff -ru test/disable_both/expected/00570_e_isok_queries_type_null.out test/disable_both/results/00570_e_isok_queries_type_null.out
--- test/disable_both/expected/00570_e_isok_queries_type_null.out	2025-05-29 15:24:46.608723804 -0500
+++ test/disable_both/results/00570_e_isok_queries_type_null.out	2025-05-29 15:24:50.076723587 -0500
@@ -14,6 +14,6 @@
                 , ('R6', 'Result number 6', NULL);$$
        , 'No comment'
        );
-ERROR:  null value in column "type" of relation "isok_queries" violates not-null constraint
+ERROR:  null value in column "type" violates not-null constraint
 DETAIL:  Failing row contains (query2, f, null, f, null, null, null, null, VALUES ('R4', 'Result number 4', NULL)
                 , ('R5', ..., No comment).
diff -ru test/disable_both/expected/00580_e_isok_queries_keep_null.out test/disable_both/results/00580_e_isok_queries_keep_null.out
--- test/disable_both/expected/00580_e_isok_queries_keep_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00580_e_isok_queries_keep_null.out	2025-05-29 15:24:50.100723586 -0500
@@ -14,6 +14,6 @@
                 , ('R6', 'Result number 6', NULL);$$
        , 'No comment'
        );
-ERROR:  null value in column "keep" of relation "isok_queries" violates not-null constraint
+ERROR:  null value in column "keep" violates not-null constraint
 DETAIL:  Failing row contains (query2, f, type1, null, null, null, null, null, VALUES ('R4', 'Result number 4', NULL)
                 , ('R5', ..., No comment).
diff -ru test/disable_both/expected/00590_e_isok_queries_comment_null.out test/disable_both/results/00590_e_isok_queries_comment_null.out
--- test/disable_both/expected/00590_e_isok_queries_comment_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00590_e_isok_queries_comment_null.out	2025-05-29 15:24:50.124723583 -0500
@@ -14,6 +14,6 @@
                 , ('R6', 'Result number 6', NULL);$$
        , NULL
        );
-ERROR:  null value in column "comment" of relation "isok_queries" violates not-null constraint
+ERROR:  null value in column "comment" violates not-null constraint
 DETAIL:  Failing row contains (query2, f, type1, f, null, null, null, null, VALUES ('R4', 'Result number 4', NULL)
                 , ('R5', ..., null).
diff -ru test/disable_both/expected/00810_e_isok_results_irid_null.out test/disable_both/results/00810_e_isok_results_irid_null.out
--- test/disable_both/expected/00810_e_isok_results_irid_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00810_e_isok_results_irid_null.out	2025-05-29 15:24:50.444723563 -0500
@@ -18,5 +18,5 @@
         , 'Informative message'
         , NULL
         , '');
-ERROR:  null value in column "irid" of relation "isok_results" violates not-null constraint
+ERROR:  null value in column "irid" violates not-null constraint
 DETAIL:  Failing row contains (null, query1, Mon Jan 01 00:00:00 1900, Mon Jan 01 00:00:00 1900, somerole, {schema1,schema2}, null, null, rtype1, null, testresult2, Informative message, null, ).
diff -ru test/disable_both/expected/00840_e_isok_results_first_seen_null.out test/disable_both/results/00840_e_isok_results_first_seen_null.out
--- test/disable_both/expected/00840_e_isok_results_first_seen_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00840_e_isok_results_first_seen_null.out	2025-05-29 15:24:50.548723557 -0500
@@ -17,5 +17,5 @@
         , 'Informative message'
         , NULL
         , '');
-ERROR:  null value in column "first_seen" of relation "isok_results" violates not-null constraint
+ERROR:  null value in column "first_seen" violates not-null constraint
 DETAIL:  Failing row contains (3, query1, null, Mon Jan 01 00:00:00 1900, somerole, {schema1,schema2}, null, null, rtype1, null, testresult2, Informative message, null, ).
diff -ru test/disable_both/expected/00850_e_isok_results_last_seen_null.out test/disable_both/results/00850_e_isok_results_last_seen_null.out
--- test/disable_both/expected/00850_e_isok_results_last_seen_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00850_e_isok_results_last_seen_null.out	2025-05-29 15:24:50.588723554 -0500
@@ -17,5 +17,5 @@
         , 'Informative message'
         , NULL
         , '');
-ERROR:  null value in column "last_seen" of relation "isok_results" violates not-null constraint
+ERROR:  null value in column "last_seen" violates not-null constraint
 DETAIL:  Failing row contains (4, query1, Mon Jan 01 00:00:00 1900, null, somerole, {schema1,schema2}, null, null, rtype1, null, testresult2, Informative message, null, ).
diff -ru test/disable_both/expected/00860_e_isok_results_last_role_null.out test/disable_both/results/00860_e_isok_results_last_role_null.out
--- test/disable_both/expected/00860_e_isok_results_last_role_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00860_e_isok_results_last_role_null.out	2025-05-29 15:24:50.628723552 -0500
@@ -17,5 +17,5 @@
         , 'Informative message'
         , NULL
         , '');
-ERROR:  null value in column "last_role" of relation "isok_results" violates not-null constraint
+ERROR:  null value in column "last_role" violates not-null constraint
 DETAIL:  Failing row contains (5, query1, Mon Jan 01 00:00:00 1900, Mon Jan 01 00:00:00 1900, null, {schema1,schema2}, null, null, rtype1, null, testresult2, Informative message, null, ).
diff -ru test/disable_both/expected/00870_e_isok_results_last_schemas_null.out test/disable_both/results/00870_e_isok_results_last_schemas_null.out
--- test/disable_both/expected/00870_e_isok_results_last_schemas_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00870_e_isok_results_last_schemas_null.out	2025-05-29 15:24:50.672723549 -0500
@@ -17,5 +17,5 @@
         , 'Informative message'
         , NULL
         , '');
-ERROR:  null value in column "last_schemas" of relation "isok_results" violates not-null constraint
+ERROR:  null value in column "last_schemas" violates not-null constraint
 DETAIL:  Failing row contains (6, query1, Mon Jan 01 00:00:00 1900, Mon Jan 01 00:00:00 1900, somerole, null, null, null, rtype1, null, testresult2, Informative message, null, ).
diff -ru test/disable_both/expected/00890_e_isok_results_qr_id_null.out test/disable_both/results/00890_e_isok_results_qr_id_null.out
--- test/disable_both/expected/00890_e_isok_results_qr_id_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00890_e_isok_results_qr_id_null.out	2025-05-29 15:24:50.744723544 -0500
@@ -17,5 +17,5 @@
         , 'Informative message'
         , NULL
         , '');
-ERROR:  null value in column "qr_id" of relation "isok_results" violates not-null constraint
+ERROR:  null value in column "qr_id" violates not-null constraint
 DETAIL:  Failing row contains (8, query1, Mon Jan 01 00:00:00 1900, Mon Jan 01 00:00:00 1900, somerole, {schema1,schema2}, null, null, rtype1, null, null, Informative message, null, ).
diff -ru test/disable_both/expected/00920_e_isok_results_qr_message_null.out test/disable_both/results/00920_e_isok_results_qr_message_null.out
--- test/disable_both/expected/00920_e_isok_results_qr_message_null.out	2025-05-29 15:24:46.612723805 -0500
+++ test/disable_both/results/00920_e_isok_results_qr_message_null.out	2025-05-29 15:24:50.832723539 -0500
@@ -17,5 +17,5 @@
         , NULL
         , NULL
         , '');
-ERROR:  null value in column "qr_message" of relation "isok_results" violates not-null constraint
+ERROR:  null value in column "qr_message" violates not-null constraint
 DETAIL:  Failing row contains (11, query1, Mon Jan 01 00:00:00 1900, Mon Jan 01 00:00:00 1900, somerole, {schema1,schema2}, null, null, rtype1, null, testresult2, null, null, ).
Only in test/disable_both/results/: 02057_run_resolved_updated_role.out
Only in test/disable_both/results/: 02100_n_run_isok_queries_role.out
Only in test/disable_both/results/: 02120_n_run_isok_queries_last_role.out