.

3 files changed, 3017 insertions, 369 deletions

diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am
index dbb36b4d1..4114c5edd 100644
--- a/tests/test/Makefile.am
+++ b/tests/test/Makefile.am
@@ -4,42 +4,97 @@
 x = test
 explicit =
 maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X le-1.X le-2.X le-3.X le-4.X \
-ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X NN-1b.X N-1c.X NN-1c.X N-1d.X NN-1d.X \
-N-streq-1.X NN-streq-1.X N-streq-2.X NN-streq-2.X N-strne-1.X NN-strne-1.X \
-N-strne-2.X NN-strne-2.X N-and-1.X NN-and-1.X N-and-2.X NN-and-2.X N-and-3.X \
-NN-and-3.X N-and-4.X NN-and-4.X N-or-1.X NN-or-1.X N-or-2.X NN-or-2.X \
-N-or-3.X NN-or-3.X N-or-4.X NN-or-4.X N-eq-1.X NN-eq-1.X N-eq-2.X NN-eq-2.X \
-N-eq-3.X NN-eq-3.X N-eq-4.X NN-eq-4.X N-eq-5.X NN-eq-5.X N-gt-1.X NN-gt-1.X \
-N-gt-2.X NN-gt-2.X N-gt-3.X NN-gt-3.X N-gt-4.X NN-gt-4.X N-lt-1.X NN-lt-1.X \
-N-lt-2.X NN-lt-2.X N-lt-3.X NN-lt-3.X N-lt-4.X NN-lt-4.X N-t2.X NN-t2.X 1a.X \
-1b.X 1c.X 1d.X streq-1.X streq-2.X strne-1.X strne-2.X and-1.X and-2.X \
-and-3.X and-4.X or-1.X or-2.X or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X \
-eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X \
-t2.X
+ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X P-1b.X NP-1b.X NNP-1b.X N-1c.X P-1c.X \
+NP-1c.X NNP-1c.X N-1d.X P-1d.X NP-1d.X NNP-1d.X N-1e.X P-1e.X NP-1e.X \
+NNP-1e.X N-1f.X P-1f.X NP-1f.X NNP-1f.X N-1g.X P-1g.X NP-1g.X NNP-1g.X N-1h.X \
+P-1h.X NP-1h.X NNP-1h.X N-1i.X P-1i.X NP-1i.X NNP-1i.X N-1j.X P-1j.X NP-1j.X \
+NNP-1j.X N-1k.X P-1k.X NP-1k.X NNP-1k.X N-streq-1.X P-streq-1.X NP-streq-1.X \
+NNP-streq-1.X N-streq-2.X P-streq-2.X NP-streq-2.X NNP-streq-2.X N-streq-3.X \
+P-streq-3.X NP-streq-3.X NNP-streq-3.X N-streq-4.X P-streq-4.X NP-streq-4.X \
+NNP-streq-4.X N-streq-5.X P-streq-5.X NP-streq-5.X NNP-streq-5.X N-streq-6.X \
+N-strne-1.X P-strne-1.X NP-strne-1.X NNP-strne-1.X N-strne-2.X P-strne-2.X \
+NP-strne-2.X NNP-strne-2.X N-strne-3.X P-strne-3.X NP-strne-3.X NNP-strne-3.X \
+N-strne-4.X P-strne-4.X NP-strne-4.X NNP-strne-4.X N-strne-5.X P-strne-5.X \
+NP-strne-5.X NNP-strne-5.X N-strne-6.X N-and-1.X P-and-1.X NP-and-1.X \
+NNP-and-1.X N-and-2.X P-and-2.X NP-and-2.X NNP-and-2.X N-and-3.X P-and-3.X \
+NP-and-3.X NNP-and-3.X N-and-4.X P-and-4.X NP-and-4.X NNP-and-4.X N-or-1.X \
+P-or-1.X NP-or-1.X NNP-or-1.X N-or-2.X P-or-2.X NP-or-2.X NNP-or-2.X N-or-3.X \
+P-or-3.X NP-or-3.X NNP-or-3.X N-or-4.X P-or-4.X NP-or-4.X NNP-or-4.X N-eq-1.X \
+P-eq-1.X NP-eq-1.X NNP-eq-1.X N-eq-2.X P-eq-2.X NP-eq-2.X NNP-eq-2.X N-eq-3.X \
+P-eq-3.X NP-eq-3.X NNP-eq-3.X N-eq-4.X P-eq-4.X NP-eq-4.X NNP-eq-4.X N-eq-5.X \
+P-eq-5.X NP-eq-5.X NNP-eq-5.X N-gt-1.X P-gt-1.X NP-gt-1.X NNP-gt-1.X N-gt-2.X \
+P-gt-2.X NP-gt-2.X NNP-gt-2.X N-gt-3.X P-gt-3.X NP-gt-3.X NNP-gt-3.X N-gt-4.X \
+P-gt-4.X NP-gt-4.X NNP-gt-4.X N-lt-1.X P-lt-1.X NP-lt-1.X NNP-lt-1.X N-lt-2.X \
+P-lt-2.X NP-lt-2.X NNP-lt-2.X N-lt-3.X P-lt-3.X NP-lt-3.X NNP-lt-3.X N-lt-4.X \
+P-lt-4.X NP-lt-4.X NNP-lt-4.X N-t1.X P-t1.X NP-t1.X NNP-t1.X N-t2.X P-t2.X \
+NP-t2.X NNP-t2.X N-paren-1.X N-paren-2.X N-paren-3.X N-paren-4.X N-paren-5.X \
+1a.X 1b.X 1c.X 1d.X 1e.X 1f.X 1g.X 1h.X 1i.X 1j.X 1k.X streq-1.X streq-2.X \
+streq-3.X streq-4.X streq-5.X streq-6.X strne-1.X strne-2.X strne-3.X \
+strne-4.X strne-5.X strne-6.X and-1.X and-2.X and-3.X and-4.X or-1.X or-2.X \
+or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X \
+lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X t2.X paren-1.X paren-2.X paren-3.X \
+paren-4.X paren-5.X
 run_gen = ne-1.O ne-1.E ne-2.O ne-2.E ne-3.O ne-3.E ne-4.O ne-4.E ne-5.O \
 ne-5.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E ge-1.O ge-1.E \
-ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E NN-1b.O NN-1b.E \
-N-1c.O N-1c.E NN-1c.O NN-1c.E N-1d.O N-1d.E NN-1d.O NN-1d.E N-streq-1.O \
-N-streq-1.E NN-streq-1.O NN-streq-1.E N-streq-2.O N-streq-2.E NN-streq-2.O \
-NN-streq-2.E N-strne-1.O N-strne-1.E NN-strne-1.O NN-strne-1.E N-strne-2.O \
-N-strne-2.E NN-strne-2.O NN-strne-2.E N-and-1.O N-and-1.E NN-and-1.O \
-NN-and-1.E N-and-2.O N-and-2.E NN-and-2.O NN-and-2.E N-and-3.O N-and-3.E \
-NN-and-3.O NN-and-3.E N-and-4.O N-and-4.E NN-and-4.O NN-and-4.E N-or-1.O \
-N-or-1.E NN-or-1.O NN-or-1.E N-or-2.O N-or-2.E NN-or-2.O NN-or-2.E N-or-3.O \
-N-or-3.E NN-or-3.O NN-or-3.E N-or-4.O N-or-4.E NN-or-4.O NN-or-4.E N-eq-1.O \
-N-eq-1.E NN-eq-1.O NN-eq-1.E N-eq-2.O N-eq-2.E NN-eq-2.O NN-eq-2.E N-eq-3.O \
-N-eq-3.E NN-eq-3.O NN-eq-3.E N-eq-4.O N-eq-4.E NN-eq-4.O NN-eq-4.E N-eq-5.O \
-N-eq-5.E NN-eq-5.O NN-eq-5.E N-gt-1.O N-gt-1.E NN-gt-1.O NN-gt-1.E N-gt-2.O \
-N-gt-2.E NN-gt-2.O NN-gt-2.E N-gt-3.O N-gt-3.E NN-gt-3.O NN-gt-3.E N-gt-4.O \
-N-gt-4.E NN-gt-4.O NN-gt-4.E N-lt-1.O N-lt-1.E NN-lt-1.O NN-lt-1.E N-lt-2.O \
-N-lt-2.E NN-lt-2.O NN-lt-2.E N-lt-3.O N-lt-3.E NN-lt-3.O NN-lt-3.E N-lt-4.O \
-N-lt-4.E NN-lt-4.O NN-lt-4.E N-t2.O N-t2.E NN-t2.O NN-t2.E 1a.O 1a.E 1b.O \
-1b.E 1c.O 1c.E 1d.O 1d.E streq-1.O streq-1.E streq-2.O streq-2.E strne-1.O \
-strne-1.E strne-2.O strne-2.E and-1.O and-1.E and-2.O and-2.E and-3.O and-3.E \
-and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E or-3.O or-3.E or-4.O or-4.E \
-eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O eq-4.E eq-5.O eq-5.E gt-1.O \
-gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E lt-1.O lt-1.E lt-2.O lt-2.E \
-lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E
+ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E P-1b.O P-1b.E NP-1b.O \
+NP-1b.E NNP-1b.O NNP-1b.E N-1c.O N-1c.E P-1c.O P-1c.E NP-1c.O NP-1c.E \
+NNP-1c.O NNP-1c.E N-1d.O N-1d.E P-1d.O P-1d.E NP-1d.O NP-1d.E NNP-1d.O \
+NNP-1d.E N-1e.O N-1e.E P-1e.O P-1e.E NP-1e.O NP-1e.E NNP-1e.O NNP-1e.E N-1f.O \
+N-1f.E P-1f.O P-1f.E NP-1f.O NP-1f.E NNP-1f.O NNP-1f.E N-1g.O N-1g.E P-1g.O \
+P-1g.E NP-1g.O NP-1g.E NNP-1g.O NNP-1g.E N-1h.O N-1h.E P-1h.O P-1h.E NP-1h.O \
+NP-1h.E NNP-1h.O NNP-1h.E N-1i.O N-1i.E P-1i.O P-1i.E NP-1i.O NP-1i.E \
+NNP-1i.O NNP-1i.E N-1j.O N-1j.E P-1j.O P-1j.E NP-1j.O NP-1j.E NNP-1j.O \
+NNP-1j.E N-1k.O N-1k.E P-1k.O P-1k.E NP-1k.O NP-1k.E NNP-1k.O NNP-1k.E \
+N-streq-1.O N-streq-1.E P-streq-1.O P-streq-1.E NP-streq-1.O NP-streq-1.E \
+NNP-streq-1.O NNP-streq-1.E N-streq-2.O N-streq-2.E P-streq-2.O P-streq-2.E \
+NP-streq-2.O NP-streq-2.E NNP-streq-2.O NNP-streq-2.E N-streq-3.O N-streq-3.E \
+P-streq-3.O P-streq-3.E NP-streq-3.O NP-streq-3.E NNP-streq-3.O NNP-streq-3.E \
+N-streq-4.O N-streq-4.E P-streq-4.O P-streq-4.E NP-streq-4.O NP-streq-4.E \
+NNP-streq-4.O NNP-streq-4.E N-streq-5.O N-streq-5.E P-streq-5.O P-streq-5.E \
+NP-streq-5.O NP-streq-5.E NNP-streq-5.O NNP-streq-5.E N-streq-6.O N-streq-6.E \
+N-strne-1.O N-strne-1.E P-strne-1.O P-strne-1.E NP-strne-1.O NP-strne-1.E \
+NNP-strne-1.O NNP-strne-1.E N-strne-2.O N-strne-2.E P-strne-2.O P-strne-2.E \
+NP-strne-2.O NP-strne-2.E NNP-strne-2.O NNP-strne-2.E N-strne-3.O N-strne-3.E \
+P-strne-3.O P-strne-3.E NP-strne-3.O NP-strne-3.E NNP-strne-3.O NNP-strne-3.E \
+N-strne-4.O N-strne-4.E P-strne-4.O P-strne-4.E NP-strne-4.O NP-strne-4.E \
+NNP-strne-4.O NNP-strne-4.E N-strne-5.O N-strne-5.E P-strne-5.O P-strne-5.E \
+NP-strne-5.O NP-strne-5.E NNP-strne-5.O NNP-strne-5.E N-strne-6.O N-strne-6.E \
+N-and-1.O N-and-1.E P-and-1.O P-and-1.E NP-and-1.O NP-and-1.E NNP-and-1.O \
+NNP-and-1.E N-and-2.O N-and-2.E P-and-2.O P-and-2.E NP-and-2.O NP-and-2.E \
+NNP-and-2.O NNP-and-2.E N-and-3.O N-and-3.E P-and-3.O P-and-3.E NP-and-3.O \
+NP-and-3.E NNP-and-3.O NNP-and-3.E N-and-4.O N-and-4.E P-and-4.O P-and-4.E \
+NP-and-4.O NP-and-4.E NNP-and-4.O NNP-and-4.E N-or-1.O N-or-1.E P-or-1.O \
+P-or-1.E NP-or-1.O NP-or-1.E NNP-or-1.O NNP-or-1.E N-or-2.O N-or-2.E P-or-2.O \
+P-or-2.E NP-or-2.O NP-or-2.E NNP-or-2.O NNP-or-2.E N-or-3.O N-or-3.E P-or-3.O \
+P-or-3.E NP-or-3.O NP-or-3.E NNP-or-3.O NNP-or-3.E N-or-4.O N-or-4.E P-or-4.O \
+P-or-4.E NP-or-4.O NP-or-4.E NNP-or-4.O NNP-or-4.E N-eq-1.O N-eq-1.E P-eq-1.O \
+P-eq-1.E NP-eq-1.O NP-eq-1.E NNP-eq-1.O NNP-eq-1.E N-eq-2.O N-eq-2.E P-eq-2.O \
+P-eq-2.E NP-eq-2.O NP-eq-2.E NNP-eq-2.O NNP-eq-2.E N-eq-3.O N-eq-3.E P-eq-3.O \
+P-eq-3.E NP-eq-3.O NP-eq-3.E NNP-eq-3.O NNP-eq-3.E N-eq-4.O N-eq-4.E P-eq-4.O \
+P-eq-4.E NP-eq-4.O NP-eq-4.E NNP-eq-4.O NNP-eq-4.E N-eq-5.O N-eq-5.E P-eq-5.O \
+P-eq-5.E NP-eq-5.O NP-eq-5.E NNP-eq-5.O NNP-eq-5.E N-gt-1.O N-gt-1.E P-gt-1.O \
+P-gt-1.E NP-gt-1.O NP-gt-1.E NNP-gt-1.O NNP-gt-1.E N-gt-2.O N-gt-2.E P-gt-2.O \
+P-gt-2.E NP-gt-2.O NP-gt-2.E NNP-gt-2.O NNP-gt-2.E N-gt-3.O N-gt-3.E P-gt-3.O \
+P-gt-3.E NP-gt-3.O NP-gt-3.E NNP-gt-3.O NNP-gt-3.E N-gt-4.O N-gt-4.E P-gt-4.O \
+P-gt-4.E NP-gt-4.O NP-gt-4.E NNP-gt-4.O NNP-gt-4.E N-lt-1.O N-lt-1.E P-lt-1.O \
+P-lt-1.E NP-lt-1.O NP-lt-1.E NNP-lt-1.O NNP-lt-1.E N-lt-2.O N-lt-2.E P-lt-2.O \
+P-lt-2.E NP-lt-2.O NP-lt-2.E NNP-lt-2.O NNP-lt-2.E N-lt-3.O N-lt-3.E P-lt-3.O \
+P-lt-3.E NP-lt-3.O NP-lt-3.E NNP-lt-3.O NNP-lt-3.E N-lt-4.O N-lt-4.E P-lt-4.O \
+P-lt-4.E NP-lt-4.O NP-lt-4.E NNP-lt-4.O NNP-lt-4.E N-t1.O N-t1.E P-t1.O \
+P-t1.E NP-t1.O NP-t1.E NNP-t1.O NNP-t1.E N-t2.O N-t2.E P-t2.O P-t2.E NP-t2.O \
+NP-t2.E NNP-t2.O NNP-t2.E N-paren-1.O N-paren-1.E N-paren-2.O N-paren-2.E \
+N-paren-3.O N-paren-3.E N-paren-4.O N-paren-4.E N-paren-5.O N-paren-5.E 1a.O \
+1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O 1g.E 1h.O 1h.E \
+1i.O 1i.E 1j.O 1j.E 1k.O 1k.E streq-1.O streq-1.E streq-2.O streq-2.E \
+streq-3.O streq-3.E streq-4.O streq-4.E streq-5.O streq-5.E streq-6.O \
+streq-6.E strne-1.O strne-1.E strne-2.O strne-2.E strne-3.O strne-3.E \
+strne-4.O strne-4.E strne-5.O strne-5.E strne-6.O strne-6.E and-1.O and-1.E \
+and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E \
+or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O \
+eq-4.E eq-5.O eq-5.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E \
+lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O \
+t1.E t2.O t2.E paren-1.O paren-1.E paren-2.O paren-2.E paren-3.O paren-3.E \
+paren-4.O paren-4.E paren-5.O paren-5.E
 ##test-files-end
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in
index ad0ccd9d7..b9ee003c2 100644
--- a/tests/test/Makefile.in
+++ b/tests/test/Makefile.in
@@ -154,43 +154,98 @@ target_alias = @target_alias@
 x = test
 explicit = 
 maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X le-1.X le-2.X le-3.X le-4.X \
-ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X NN-1b.X N-1c.X NN-1c.X N-1d.X NN-1d.X \
-N-streq-1.X NN-streq-1.X N-streq-2.X NN-streq-2.X N-strne-1.X NN-strne-1.X \
-N-strne-2.X NN-strne-2.X N-and-1.X NN-and-1.X N-and-2.X NN-and-2.X N-and-3.X \
-NN-and-3.X N-and-4.X NN-and-4.X N-or-1.X NN-or-1.X N-or-2.X NN-or-2.X \
-N-or-3.X NN-or-3.X N-or-4.X NN-or-4.X N-eq-1.X NN-eq-1.X N-eq-2.X NN-eq-2.X \
-N-eq-3.X NN-eq-3.X N-eq-4.X NN-eq-4.X N-eq-5.X NN-eq-5.X N-gt-1.X NN-gt-1.X \
-N-gt-2.X NN-gt-2.X N-gt-3.X NN-gt-3.X N-gt-4.X NN-gt-4.X N-lt-1.X NN-lt-1.X \
-N-lt-2.X NN-lt-2.X N-lt-3.X NN-lt-3.X N-lt-4.X NN-lt-4.X N-t2.X NN-t2.X 1a.X \
-1b.X 1c.X 1d.X streq-1.X streq-2.X strne-1.X strne-2.X and-1.X and-2.X \
-and-3.X and-4.X or-1.X or-2.X or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X \
-eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X \
-t2.X
+ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X P-1b.X NP-1b.X NNP-1b.X N-1c.X P-1c.X \
+NP-1c.X NNP-1c.X N-1d.X P-1d.X NP-1d.X NNP-1d.X N-1e.X P-1e.X NP-1e.X \
+NNP-1e.X N-1f.X P-1f.X NP-1f.X NNP-1f.X N-1g.X P-1g.X NP-1g.X NNP-1g.X N-1h.X \
+P-1h.X NP-1h.X NNP-1h.X N-1i.X P-1i.X NP-1i.X NNP-1i.X N-1j.X P-1j.X NP-1j.X \
+NNP-1j.X N-1k.X P-1k.X NP-1k.X NNP-1k.X N-streq-1.X P-streq-1.X NP-streq-1.X \
+NNP-streq-1.X N-streq-2.X P-streq-2.X NP-streq-2.X NNP-streq-2.X N-streq-3.X \
+P-streq-3.X NP-streq-3.X NNP-streq-3.X N-streq-4.X P-streq-4.X NP-streq-4.X \
+NNP-streq-4.X N-streq-5.X P-streq-5.X NP-streq-5.X NNP-streq-5.X N-streq-6.X \
+N-strne-1.X P-strne-1.X NP-strne-1.X NNP-strne-1.X N-strne-2.X P-strne-2.X \
+NP-strne-2.X NNP-strne-2.X N-strne-3.X P-strne-3.X NP-strne-3.X NNP-strne-3.X \
+N-strne-4.X P-strne-4.X NP-strne-4.X NNP-strne-4.X N-strne-5.X P-strne-5.X \
+NP-strne-5.X NNP-strne-5.X N-strne-6.X N-and-1.X P-and-1.X NP-and-1.X \
+NNP-and-1.X N-and-2.X P-and-2.X NP-and-2.X NNP-and-2.X N-and-3.X P-and-3.X \
+NP-and-3.X NNP-and-3.X N-and-4.X P-and-4.X NP-and-4.X NNP-and-4.X N-or-1.X \
+P-or-1.X NP-or-1.X NNP-or-1.X N-or-2.X P-or-2.X NP-or-2.X NNP-or-2.X N-or-3.X \
+P-or-3.X NP-or-3.X NNP-or-3.X N-or-4.X P-or-4.X NP-or-4.X NNP-or-4.X N-eq-1.X \
+P-eq-1.X NP-eq-1.X NNP-eq-1.X N-eq-2.X P-eq-2.X NP-eq-2.X NNP-eq-2.X N-eq-3.X \
+P-eq-3.X NP-eq-3.X NNP-eq-3.X N-eq-4.X P-eq-4.X NP-eq-4.X NNP-eq-4.X N-eq-5.X \
+P-eq-5.X NP-eq-5.X NNP-eq-5.X N-gt-1.X P-gt-1.X NP-gt-1.X NNP-gt-1.X N-gt-2.X \
+P-gt-2.X NP-gt-2.X NNP-gt-2.X N-gt-3.X P-gt-3.X NP-gt-3.X NNP-gt-3.X N-gt-4.X \
+P-gt-4.X NP-gt-4.X NNP-gt-4.X N-lt-1.X P-lt-1.X NP-lt-1.X NNP-lt-1.X N-lt-2.X \
+P-lt-2.X NP-lt-2.X NNP-lt-2.X N-lt-3.X P-lt-3.X NP-lt-3.X NNP-lt-3.X N-lt-4.X \
+P-lt-4.X NP-lt-4.X NNP-lt-4.X N-t1.X P-t1.X NP-t1.X NNP-t1.X N-t2.X P-t2.X \
+NP-t2.X NNP-t2.X N-paren-1.X N-paren-2.X N-paren-3.X N-paren-4.X N-paren-5.X \
+1a.X 1b.X 1c.X 1d.X 1e.X 1f.X 1g.X 1h.X 1i.X 1j.X 1k.X streq-1.X streq-2.X \
+streq-3.X streq-4.X streq-5.X streq-6.X strne-1.X strne-2.X strne-3.X \
+strne-4.X strne-5.X strne-6.X and-1.X and-2.X and-3.X and-4.X or-1.X or-2.X \
+or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X \
+lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X t2.X paren-1.X paren-2.X paren-3.X \
+paren-4.X paren-5.X
 
 run_gen = ne-1.O ne-1.E ne-2.O ne-2.E ne-3.O ne-3.E ne-4.O ne-4.E ne-5.O \
 ne-5.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E ge-1.O ge-1.E \
-ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E NN-1b.O NN-1b.E \
-N-1c.O N-1c.E NN-1c.O NN-1c.E N-1d.O N-1d.E NN-1d.O NN-1d.E N-streq-1.O \
-N-streq-1.E NN-streq-1.O NN-streq-1.E N-streq-2.O N-streq-2.E NN-streq-2.O \
-NN-streq-2.E N-strne-1.O N-strne-1.E NN-strne-1.O NN-strne-1.E N-strne-2.O \
-N-strne-2.E NN-strne-2.O NN-strne-2.E N-and-1.O N-and-1.E NN-and-1.O \
-NN-and-1.E N-and-2.O N-and-2.E NN-and-2.O NN-and-2.E N-and-3.O N-and-3.E \
-NN-and-3.O NN-and-3.E N-and-4.O N-and-4.E NN-and-4.O NN-and-4.E N-or-1.O \
-N-or-1.E NN-or-1.O NN-or-1.E N-or-2.O N-or-2.E NN-or-2.O NN-or-2.E N-or-3.O \
-N-or-3.E NN-or-3.O NN-or-3.E N-or-4.O N-or-4.E NN-or-4.O NN-or-4.E N-eq-1.O \
-N-eq-1.E NN-eq-1.O NN-eq-1.E N-eq-2.O N-eq-2.E NN-eq-2.O NN-eq-2.E N-eq-3.O \
-N-eq-3.E NN-eq-3.O NN-eq-3.E N-eq-4.O N-eq-4.E NN-eq-4.O NN-eq-4.E N-eq-5.O \
-N-eq-5.E NN-eq-5.O NN-eq-5.E N-gt-1.O N-gt-1.E NN-gt-1.O NN-gt-1.E N-gt-2.O \
-N-gt-2.E NN-gt-2.O NN-gt-2.E N-gt-3.O N-gt-3.E NN-gt-3.O NN-gt-3.E N-gt-4.O \
-N-gt-4.E NN-gt-4.O NN-gt-4.E N-lt-1.O N-lt-1.E NN-lt-1.O NN-lt-1.E N-lt-2.O \
-N-lt-2.E NN-lt-2.O NN-lt-2.E N-lt-3.O N-lt-3.E NN-lt-3.O NN-lt-3.E N-lt-4.O \
-N-lt-4.E NN-lt-4.O NN-lt-4.E N-t2.O N-t2.E NN-t2.O NN-t2.E 1a.O 1a.E 1b.O \
-1b.E 1c.O 1c.E 1d.O 1d.E streq-1.O streq-1.E streq-2.O streq-2.E strne-1.O \
-strne-1.E strne-2.O strne-2.E and-1.O and-1.E and-2.O and-2.E and-3.O and-3.E \
-and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E or-3.O or-3.E or-4.O or-4.E \
-eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O eq-4.E eq-5.O eq-5.E gt-1.O \
-gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E lt-1.O lt-1.E lt-2.O lt-2.E \
-lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E
+ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E P-1b.O P-1b.E NP-1b.O \
+NP-1b.E NNP-1b.O NNP-1b.E N-1c.O N-1c.E P-1c.O P-1c.E NP-1c.O NP-1c.E \
+NNP-1c.O NNP-1c.E N-1d.O N-1d.E P-1d.O P-1d.E NP-1d.O NP-1d.E NNP-1d.O \
+NNP-1d.E N-1e.O N-1e.E P-1e.O P-1e.E NP-1e.O NP-1e.E NNP-1e.O NNP-1e.E N-1f.O \
+N-1f.E P-1f.O P-1f.E NP-1f.O NP-1f.E NNP-1f.O NNP-1f.E N-1g.O N-1g.E P-1g.O \
+P-1g.E NP-1g.O NP-1g.E NNP-1g.O NNP-1g.E N-1h.O N-1h.E P-1h.O P-1h.E NP-1h.O \
+NP-1h.E NNP-1h.O NNP-1h.E N-1i.O N-1i.E P-1i.O P-1i.E NP-1i.O NP-1i.E \
+NNP-1i.O NNP-1i.E N-1j.O N-1j.E P-1j.O P-1j.E NP-1j.O NP-1j.E NNP-1j.O \
+NNP-1j.E N-1k.O N-1k.E P-1k.O P-1k.E NP-1k.O NP-1k.E NNP-1k.O NNP-1k.E \
+N-streq-1.O N-streq-1.E P-streq-1.O P-streq-1.E NP-streq-1.O NP-streq-1.E \
+NNP-streq-1.O NNP-streq-1.E N-streq-2.O N-streq-2.E P-streq-2.O P-streq-2.E \
+NP-streq-2.O NP-streq-2.E NNP-streq-2.O NNP-streq-2.E N-streq-3.O N-streq-3.E \
+P-streq-3.O P-streq-3.E NP-streq-3.O NP-streq-3.E NNP-streq-3.O NNP-streq-3.E \
+N-streq-4.O N-streq-4.E P-streq-4.O P-streq-4.E NP-streq-4.O NP-streq-4.E \
+NNP-streq-4.O NNP-streq-4.E N-streq-5.O N-streq-5.E P-streq-5.O P-streq-5.E \
+NP-streq-5.O NP-streq-5.E NNP-streq-5.O NNP-streq-5.E N-streq-6.O N-streq-6.E \
+N-strne-1.O N-strne-1.E P-strne-1.O P-strne-1.E NP-strne-1.O NP-strne-1.E \
+NNP-strne-1.O NNP-strne-1.E N-strne-2.O N-strne-2.E P-strne-2.O P-strne-2.E \
+NP-strne-2.O NP-strne-2.E NNP-strne-2.O NNP-strne-2.E N-strne-3.O N-strne-3.E \
+P-strne-3.O P-strne-3.E NP-strne-3.O NP-strne-3.E NNP-strne-3.O NNP-strne-3.E \
+N-strne-4.O N-strne-4.E P-strne-4.O P-strne-4.E NP-strne-4.O NP-strne-4.E \
+NNP-strne-4.O NNP-strne-4.E N-strne-5.O N-strne-5.E P-strne-5.O P-strne-5.E \
+NP-strne-5.O NP-strne-5.E NNP-strne-5.O NNP-strne-5.E N-strne-6.O N-strne-6.E \
+N-and-1.O N-and-1.E P-and-1.O P-and-1.E NP-and-1.O NP-and-1.E NNP-and-1.O \
+NNP-and-1.E N-and-2.O N-and-2.E P-and-2.O P-and-2.E NP-and-2.O NP-and-2.E \
+NNP-and-2.O NNP-and-2.E N-and-3.O N-and-3.E P-and-3.O P-and-3.E NP-and-3.O \
+NP-and-3.E NNP-and-3.O NNP-and-3.E N-and-4.O N-and-4.E P-and-4.O P-and-4.E \
+NP-and-4.O NP-and-4.E NNP-and-4.O NNP-and-4.E N-or-1.O N-or-1.E P-or-1.O \
+P-or-1.E NP-or-1.O NP-or-1.E NNP-or-1.O NNP-or-1.E N-or-2.O N-or-2.E P-or-2.O \
+P-or-2.E NP-or-2.O NP-or-2.E NNP-or-2.O NNP-or-2.E N-or-3.O N-or-3.E P-or-3.O \
+P-or-3.E NP-or-3.O NP-or-3.E NNP-or-3.O NNP-or-3.E N-or-4.O N-or-4.E P-or-4.O \
+P-or-4.E NP-or-4.O NP-or-4.E NNP-or-4.O NNP-or-4.E N-eq-1.O N-eq-1.E P-eq-1.O \
+P-eq-1.E NP-eq-1.O NP-eq-1.E NNP-eq-1.O NNP-eq-1.E N-eq-2.O N-eq-2.E P-eq-2.O \
+P-eq-2.E NP-eq-2.O NP-eq-2.E NNP-eq-2.O NNP-eq-2.E N-eq-3.O N-eq-3.E P-eq-3.O \
+P-eq-3.E NP-eq-3.O NP-eq-3.E NNP-eq-3.O NNP-eq-3.E N-eq-4.O N-eq-4.E P-eq-4.O \
+P-eq-4.E NP-eq-4.O NP-eq-4.E NNP-eq-4.O NNP-eq-4.E N-eq-5.O N-eq-5.E P-eq-5.O \
+P-eq-5.E NP-eq-5.O NP-eq-5.E NNP-eq-5.O NNP-eq-5.E N-gt-1.O N-gt-1.E P-gt-1.O \
+P-gt-1.E NP-gt-1.O NP-gt-1.E NNP-gt-1.O NNP-gt-1.E N-gt-2.O N-gt-2.E P-gt-2.O \
+P-gt-2.E NP-gt-2.O NP-gt-2.E NNP-gt-2.O NNP-gt-2.E N-gt-3.O N-gt-3.E P-gt-3.O \
+P-gt-3.E NP-gt-3.O NP-gt-3.E NNP-gt-3.O NNP-gt-3.E N-gt-4.O N-gt-4.E P-gt-4.O \
+P-gt-4.E NP-gt-4.O NP-gt-4.E NNP-gt-4.O NNP-gt-4.E N-lt-1.O N-lt-1.E P-lt-1.O \
+P-lt-1.E NP-lt-1.O NP-lt-1.E NNP-lt-1.O NNP-lt-1.E N-lt-2.O N-lt-2.E P-lt-2.O \
+P-lt-2.E NP-lt-2.O NP-lt-2.E NNP-lt-2.O NNP-lt-2.E N-lt-3.O N-lt-3.E P-lt-3.O \
+P-lt-3.E NP-lt-3.O NP-lt-3.E NNP-lt-3.O NNP-lt-3.E N-lt-4.O N-lt-4.E P-lt-4.O \
+P-lt-4.E NP-lt-4.O NP-lt-4.E NNP-lt-4.O NNP-lt-4.E N-t1.O N-t1.E P-t1.O \
+P-t1.E NP-t1.O NP-t1.E NNP-t1.O NNP-t1.E N-t2.O N-t2.E P-t2.O P-t2.E NP-t2.O \
+NP-t2.E NNP-t2.O NNP-t2.E N-paren-1.O N-paren-1.E N-paren-2.O N-paren-2.E \
+N-paren-3.O N-paren-3.E N-paren-4.O N-paren-4.E N-paren-5.O N-paren-5.E 1a.O \
+1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O 1g.E 1h.O 1h.E \
+1i.O 1i.E 1j.O 1j.E 1k.O 1k.E streq-1.O streq-1.E streq-2.O streq-2.E \
+streq-3.O streq-3.E streq-4.O streq-4.E streq-5.O streq-5.E streq-6.O \
+streq-6.E strne-1.O strne-1.E strne-2.O strne-2.E strne-3.O strne-3.E \
+strne-4.O strne-4.E strne-5.O strne-5.E strne-6.O strne-6.E and-1.O and-1.E \
+and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E \
+or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O \
+eq-4.E eq-5.O eq-5.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E \
+lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O \
+t1.E t2.O t2.E paren-1.O paren-1.E paren-2.O paren-2.E paren-3.O paren-3.E \
+paren-4.O paren-4.E paren-5.O paren-5.E
 
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/test/test-tests b/tests/test/test-tests
index facb97f38..0b387b9b6 100755
--- a/tests/test/test-tests
+++ b/tests/test/test-tests
@@ -252,7 +252,7 @@ else
   esac
 fi
 test -s ge-4.E || rm -f ge-4.E
-$xx ! '(' -z '' ')'  > N-1b.O 2> N-1b.E
+$xx ! -z ''  > N-1b.O 2> N-1b.E
 code=$?
 if test $code != 1; then
   $echo "Test N-1b failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -270,25 +270,61 @@ else
   esac
 fi
 test -s N-1b.E || rm -f N-1b.E
-$xx ! ! '(' -z '' ')'  > NN-1b.O 2> NN-1b.E
+$xx '(' -z '' ')'  > P-1b.O 2> P-1b.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-1b failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1b failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-1b.O $srcdir/NN-1b.X > /dev/null 2>&1
+  cmp P-1b.O $srcdir/P-1b.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-1b"; fi;;
-    1) $echo "Test NN-1b failed: files NN-1b.O and $srcdir/NN-1b.X differ" 1>&2
-       (diff -c NN-1b.O $srcdir/NN-1b.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-1b"; fi;;
+    1) $echo "Test P-1b failed: files P-1b.O and $srcdir/P-1b.X differ" 1>&2
+       (diff -c P-1b.O $srcdir/P-1b.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-1b may have failed." 1>&2
-       $echo The command "cmp NN-1b.O $srcdir/NN-1b.X" failed. 1>&2
+    2) $echo "Test P-1b may have failed." 1>&2
+       $echo The command "cmp P-1b.O $srcdir/P-1b.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-1b.E || rm -f NN-1b.E
-$xx ! '(' any-string ')'  > N-1c.O 2> N-1c.E
+test -s P-1b.E || rm -f P-1b.E
+$xx ! '(' -z '' ')'  > NP-1b.O 2> NP-1b.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1b failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1b.O $srcdir/NP-1b.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1b"; fi;;
+    1) $echo "Test NP-1b failed: files NP-1b.O and $srcdir/NP-1b.X differ" 1>&2
+       (diff -c NP-1b.O $srcdir/NP-1b.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1b may have failed." 1>&2
+       $echo The command "cmp NP-1b.O $srcdir/NP-1b.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1b.E || rm -f NP-1b.E
+$xx ! ! '(' -z '' ')'  > NNP-1b.O 2> NNP-1b.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-1b failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1b.O $srcdir/NNP-1b.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1b"; fi;;
+    1) $echo "Test NNP-1b failed: files NNP-1b.O and $srcdir/NNP-1b.X differ" 1>&2
+       (diff -c NNP-1b.O $srcdir/NNP-1b.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1b may have failed." 1>&2
+       $echo The command "cmp NNP-1b.O $srcdir/NNP-1b.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1b.E || rm -f NNP-1b.E
+$xx ! any-string  > N-1c.O 2> N-1c.E
 code=$?
 if test $code != 1; then
   $echo "Test N-1c failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -306,25 +342,61 @@ else
   esac
 fi
 test -s N-1c.E || rm -f N-1c.E
-$xx ! ! '(' any-string ')'  > NN-1c.O 2> NN-1c.E
+$xx '(' any-string ')'  > P-1c.O 2> P-1c.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1c failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1c.O $srcdir/P-1c.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1c"; fi;;
+    1) $echo "Test P-1c failed: files P-1c.O and $srcdir/P-1c.X differ" 1>&2
+       (diff -c P-1c.O $srcdir/P-1c.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1c may have failed." 1>&2
+       $echo The command "cmp P-1c.O $srcdir/P-1c.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1c.E || rm -f P-1c.E
+$xx ! '(' any-string ')'  > NP-1c.O 2> NP-1c.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1c failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1c.O $srcdir/NP-1c.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1c"; fi;;
+    1) $echo "Test NP-1c failed: files NP-1c.O and $srcdir/NP-1c.X differ" 1>&2
+       (diff -c NP-1c.O $srcdir/NP-1c.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1c may have failed." 1>&2
+       $echo The command "cmp NP-1c.O $srcdir/NP-1c.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1c.E || rm -f NP-1c.E
+$xx ! ! '(' any-string ')'  > NNP-1c.O 2> NNP-1c.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-1c failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1c failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-1c.O $srcdir/NN-1c.X > /dev/null 2>&1
+  cmp NNP-1c.O $srcdir/NNP-1c.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-1c"; fi;;
-    1) $echo "Test NN-1c failed: files NN-1c.O and $srcdir/NN-1c.X differ" 1>&2
-       (diff -c NN-1c.O $srcdir/NN-1c.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-1c"; fi;;
+    1) $echo "Test NNP-1c failed: files NNP-1c.O and $srcdir/NNP-1c.X differ" 1>&2
+       (diff -c NNP-1c.O $srcdir/NNP-1c.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-1c may have failed." 1>&2
-       $echo The command "cmp NN-1c.O $srcdir/NN-1c.X" failed. 1>&2
+    2) $echo "Test NNP-1c may have failed." 1>&2
+       $echo The command "cmp NNP-1c.O $srcdir/NNP-1c.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-1c.E || rm -f NN-1c.E
-$xx ! '(' -n any-string ')'  > N-1d.O 2> N-1d.E
+test -s NNP-1c.E || rm -f NNP-1c.E
+$xx ! -n any-string  > N-1d.O 2> N-1d.E
 code=$?
 if test $code != 1; then
   $echo "Test N-1d failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -342,25 +414,565 @@ else
   esac
 fi
 test -s N-1d.E || rm -f N-1d.E
-$xx ! ! '(' -n any-string ')'  > NN-1d.O 2> NN-1d.E
+$xx '(' -n any-string ')'  > P-1d.O 2> P-1d.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1d failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1d.O $srcdir/P-1d.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1d"; fi;;
+    1) $echo "Test P-1d failed: files P-1d.O and $srcdir/P-1d.X differ" 1>&2
+       (diff -c P-1d.O $srcdir/P-1d.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1d may have failed." 1>&2
+       $echo The command "cmp P-1d.O $srcdir/P-1d.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1d.E || rm -f P-1d.E
+$xx ! '(' -n any-string ')'  > NP-1d.O 2> NP-1d.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1d failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1d.O $srcdir/NP-1d.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1d"; fi;;
+    1) $echo "Test NP-1d failed: files NP-1d.O and $srcdir/NP-1d.X differ" 1>&2
+       (diff -c NP-1d.O $srcdir/NP-1d.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1d may have failed." 1>&2
+       $echo The command "cmp NP-1d.O $srcdir/NP-1d.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1d.E || rm -f NP-1d.E
+$xx ! ! '(' -n any-string ')'  > NNP-1d.O 2> NNP-1d.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-1d failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1d.O $srcdir/NNP-1d.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1d"; fi;;
+    1) $echo "Test NNP-1d failed: files NNP-1d.O and $srcdir/NNP-1d.X differ" 1>&2
+       (diff -c NNP-1d.O $srcdir/NNP-1d.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1d may have failed." 1>&2
+       $echo The command "cmp NNP-1d.O $srcdir/NNP-1d.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1d.E || rm -f NNP-1d.E
+$xx ! ''  > N-1e.O 2> N-1e.E
+code=$?
+if test $code != 0; then
+  $echo "Test N-1e failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-1e.O $srcdir/N-1e.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-1e"; fi;;
+    1) $echo "Test N-1e failed: files N-1e.O and $srcdir/N-1e.X differ" 1>&2
+       (diff -c N-1e.O $srcdir/N-1e.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-1e may have failed." 1>&2
+       $echo The command "cmp N-1e.O $srcdir/N-1e.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-1e.E || rm -f N-1e.E
+$xx '(' '' ')'  > P-1e.O 2> P-1e.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-1e failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1e.O $srcdir/P-1e.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1e"; fi;;
+    1) $echo "Test P-1e failed: files P-1e.O and $srcdir/P-1e.X differ" 1>&2
+       (diff -c P-1e.O $srcdir/P-1e.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1e may have failed." 1>&2
+       $echo The command "cmp P-1e.O $srcdir/P-1e.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1e.E || rm -f P-1e.E
+$xx ! '(' '' ')'  > NP-1e.O 2> NP-1e.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-1e failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1e.O $srcdir/NP-1e.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1e"; fi;;
+    1) $echo "Test NP-1e failed: files NP-1e.O and $srcdir/NP-1e.X differ" 1>&2
+       (diff -c NP-1e.O $srcdir/NP-1e.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1e may have failed." 1>&2
+       $echo The command "cmp NP-1e.O $srcdir/NP-1e.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1e.E || rm -f NP-1e.E
+$xx ! ! '(' '' ')'  > NNP-1e.O 2> NNP-1e.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-1e failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1e.O $srcdir/NNP-1e.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1e"; fi;;
+    1) $echo "Test NNP-1e failed: files NNP-1e.O and $srcdir/NNP-1e.X differ" 1>&2
+       (diff -c NNP-1e.O $srcdir/NNP-1e.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1e may have failed." 1>&2
+       $echo The command "cmp NNP-1e.O $srcdir/NNP-1e.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1e.E || rm -f NNP-1e.E
+$xx ! -  > N-1f.O 2> N-1f.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-1f failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-1f.O $srcdir/N-1f.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-1f"; fi;;
+    1) $echo "Test N-1f failed: files N-1f.O and $srcdir/N-1f.X differ" 1>&2
+       (diff -c N-1f.O $srcdir/N-1f.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-1f may have failed." 1>&2
+       $echo The command "cmp N-1f.O $srcdir/N-1f.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-1f.E || rm -f N-1f.E
+$xx '(' - ')'  > P-1f.O 2> P-1f.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1f failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1f.O $srcdir/P-1f.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1f"; fi;;
+    1) $echo "Test P-1f failed: files P-1f.O and $srcdir/P-1f.X differ" 1>&2
+       (diff -c P-1f.O $srcdir/P-1f.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1f may have failed." 1>&2
+       $echo The command "cmp P-1f.O $srcdir/P-1f.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1f.E || rm -f P-1f.E
+$xx ! '(' - ')'  > NP-1f.O 2> NP-1f.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1f failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1f.O $srcdir/NP-1f.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1f"; fi;;
+    1) $echo "Test NP-1f failed: files NP-1f.O and $srcdir/NP-1f.X differ" 1>&2
+       (diff -c NP-1f.O $srcdir/NP-1f.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1f may have failed." 1>&2
+       $echo The command "cmp NP-1f.O $srcdir/NP-1f.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1f.E || rm -f NP-1f.E
+$xx ! ! '(' - ')'  > NNP-1f.O 2> NNP-1f.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-1f failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1f.O $srcdir/NNP-1f.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1f"; fi;;
+    1) $echo "Test NNP-1f failed: files NNP-1f.O and $srcdir/NNP-1f.X differ" 1>&2
+       (diff -c NNP-1f.O $srcdir/NNP-1f.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1f may have failed." 1>&2
+       $echo The command "cmp NNP-1f.O $srcdir/NNP-1f.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1f.E || rm -f NNP-1f.E
+$xx ! --  > N-1g.O 2> N-1g.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-1g failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-1g.O $srcdir/N-1g.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-1g"; fi;;
+    1) $echo "Test N-1g failed: files N-1g.O and $srcdir/N-1g.X differ" 1>&2
+       (diff -c N-1g.O $srcdir/N-1g.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-1g may have failed." 1>&2
+       $echo The command "cmp N-1g.O $srcdir/N-1g.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-1g.E || rm -f N-1g.E
+$xx '(' -- ')'  > P-1g.O 2> P-1g.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1g failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1g.O $srcdir/P-1g.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1g"; fi;;
+    1) $echo "Test P-1g failed: files P-1g.O and $srcdir/P-1g.X differ" 1>&2
+       (diff -c P-1g.O $srcdir/P-1g.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1g may have failed." 1>&2
+       $echo The command "cmp P-1g.O $srcdir/P-1g.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1g.E || rm -f P-1g.E
+$xx ! '(' -- ')'  > NP-1g.O 2> NP-1g.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1g failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1g.O $srcdir/NP-1g.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1g"; fi;;
+    1) $echo "Test NP-1g failed: files NP-1g.O and $srcdir/NP-1g.X differ" 1>&2
+       (diff -c NP-1g.O $srcdir/NP-1g.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1g may have failed." 1>&2
+       $echo The command "cmp NP-1g.O $srcdir/NP-1g.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1g.E || rm -f NP-1g.E
+$xx ! ! '(' -- ')'  > NNP-1g.O 2> NNP-1g.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-1g failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1g.O $srcdir/NNP-1g.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1g"; fi;;
+    1) $echo "Test NNP-1g failed: files NNP-1g.O and $srcdir/NNP-1g.X differ" 1>&2
+       (diff -c NNP-1g.O $srcdir/NNP-1g.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1g may have failed." 1>&2
+       $echo The command "cmp NNP-1g.O $srcdir/NNP-1g.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1g.E || rm -f NNP-1g.E
+$xx ! -0  > N-1h.O 2> N-1h.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-1h failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-1h.O $srcdir/N-1h.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-1h"; fi;;
+    1) $echo "Test N-1h failed: files N-1h.O and $srcdir/N-1h.X differ" 1>&2
+       (diff -c N-1h.O $srcdir/N-1h.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-1h may have failed." 1>&2
+       $echo The command "cmp N-1h.O $srcdir/N-1h.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-1h.E || rm -f N-1h.E
+$xx '(' -0 ')'  > P-1h.O 2> P-1h.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1h failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1h.O $srcdir/P-1h.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1h"; fi;;
+    1) $echo "Test P-1h failed: files P-1h.O and $srcdir/P-1h.X differ" 1>&2
+       (diff -c P-1h.O $srcdir/P-1h.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1h may have failed." 1>&2
+       $echo The command "cmp P-1h.O $srcdir/P-1h.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1h.E || rm -f P-1h.E
+$xx ! '(' -0 ')'  > NP-1h.O 2> NP-1h.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1h failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1h.O $srcdir/NP-1h.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1h"; fi;;
+    1) $echo "Test NP-1h failed: files NP-1h.O and $srcdir/NP-1h.X differ" 1>&2
+       (diff -c NP-1h.O $srcdir/NP-1h.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1h may have failed." 1>&2
+       $echo The command "cmp NP-1h.O $srcdir/NP-1h.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1h.E || rm -f NP-1h.E
+$xx ! ! '(' -0 ')'  > NNP-1h.O 2> NNP-1h.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-1h failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1h.O $srcdir/NNP-1h.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1h"; fi;;
+    1) $echo "Test NNP-1h failed: files NNP-1h.O and $srcdir/NNP-1h.X differ" 1>&2
+       (diff -c NNP-1h.O $srcdir/NNP-1h.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1h may have failed." 1>&2
+       $echo The command "cmp NNP-1h.O $srcdir/NNP-1h.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1h.E || rm -f NNP-1h.E
+$xx ! -f  > N-1i.O 2> N-1i.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-1i failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-1i.O $srcdir/N-1i.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-1i"; fi;;
+    1) $echo "Test N-1i failed: files N-1i.O and $srcdir/N-1i.X differ" 1>&2
+       (diff -c N-1i.O $srcdir/N-1i.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-1i may have failed." 1>&2
+       $echo The command "cmp N-1i.O $srcdir/N-1i.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-1i.E || rm -f N-1i.E
+$xx '(' -f ')'  > P-1i.O 2> P-1i.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1i failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1i.O $srcdir/P-1i.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1i"; fi;;
+    1) $echo "Test P-1i failed: files P-1i.O and $srcdir/P-1i.X differ" 1>&2
+       (diff -c P-1i.O $srcdir/P-1i.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1i may have failed." 1>&2
+       $echo The command "cmp P-1i.O $srcdir/P-1i.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1i.E || rm -f P-1i.E
+$xx ! '(' -f ')'  > NP-1i.O 2> NP-1i.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1i failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1i.O $srcdir/NP-1i.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1i"; fi;;
+    1) $echo "Test NP-1i failed: files NP-1i.O and $srcdir/NP-1i.X differ" 1>&2
+       (diff -c NP-1i.O $srcdir/NP-1i.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1i may have failed." 1>&2
+       $echo The command "cmp NP-1i.O $srcdir/NP-1i.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1i.E || rm -f NP-1i.E
+$xx ! ! '(' -f ')'  > NNP-1i.O 2> NNP-1i.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-1d failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1i failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-1d.O $srcdir/NN-1d.X > /dev/null 2>&1
+  cmp NNP-1i.O $srcdir/NNP-1i.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-1d"; fi;;
-    1) $echo "Test NN-1d failed: files NN-1d.O and $srcdir/NN-1d.X differ" 1>&2
-       (diff -c NN-1d.O $srcdir/NN-1d.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-1i"; fi;;
+    1) $echo "Test NNP-1i failed: files NNP-1i.O and $srcdir/NNP-1i.X differ" 1>&2
+       (diff -c NNP-1i.O $srcdir/NNP-1i.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-1d may have failed." 1>&2
-       $echo The command "cmp NN-1d.O $srcdir/NN-1d.X" failed. 1>&2
+    2) $echo "Test NNP-1i may have failed." 1>&2
+       $echo The command "cmp NNP-1i.O $srcdir/NNP-1i.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-1d.E || rm -f NN-1d.E
-$xx ! '(' t = t ')'  > N-streq-1.O 2> N-streq-1.E
+test -s NNP-1i.E || rm -f NNP-1i.E
+$xx ! --help  > N-1j.O 2> N-1j.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-1j failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-1j.O $srcdir/N-1j.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-1j"; fi;;
+    1) $echo "Test N-1j failed: files N-1j.O and $srcdir/N-1j.X differ" 1>&2
+       (diff -c N-1j.O $srcdir/N-1j.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-1j may have failed." 1>&2
+       $echo The command "cmp N-1j.O $srcdir/N-1j.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-1j.E || rm -f N-1j.E
+$xx '(' --help ')'  > P-1j.O 2> P-1j.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1j failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1j.O $srcdir/P-1j.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1j"; fi;;
+    1) $echo "Test P-1j failed: files P-1j.O and $srcdir/P-1j.X differ" 1>&2
+       (diff -c P-1j.O $srcdir/P-1j.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1j may have failed." 1>&2
+       $echo The command "cmp P-1j.O $srcdir/P-1j.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1j.E || rm -f P-1j.E
+$xx ! '(' --help ')'  > NP-1j.O 2> NP-1j.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1j failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1j.O $srcdir/NP-1j.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1j"; fi;;
+    1) $echo "Test NP-1j failed: files NP-1j.O and $srcdir/NP-1j.X differ" 1>&2
+       (diff -c NP-1j.O $srcdir/NP-1j.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1j may have failed." 1>&2
+       $echo The command "cmp NP-1j.O $srcdir/NP-1j.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1j.E || rm -f NP-1j.E
+$xx ! ! '(' --help ')'  > NNP-1j.O 2> NNP-1j.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-1j failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1j.O $srcdir/NNP-1j.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1j"; fi;;
+    1) $echo "Test NNP-1j failed: files NNP-1j.O and $srcdir/NNP-1j.X differ" 1>&2
+       (diff -c NNP-1j.O $srcdir/NNP-1j.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1j may have failed." 1>&2
+       $echo The command "cmp NNP-1j.O $srcdir/NNP-1j.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1j.E || rm -f NNP-1j.E
+$xx ! --version  > N-1k.O 2> N-1k.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-1k failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-1k.O $srcdir/N-1k.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-1k"; fi;;
+    1) $echo "Test N-1k failed: files N-1k.O and $srcdir/N-1k.X differ" 1>&2
+       (diff -c N-1k.O $srcdir/N-1k.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-1k may have failed." 1>&2
+       $echo The command "cmp N-1k.O $srcdir/N-1k.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-1k.E || rm -f N-1k.E
+$xx '(' --version ')'  > P-1k.O 2> P-1k.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-1k failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-1k.O $srcdir/P-1k.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-1k"; fi;;
+    1) $echo "Test P-1k failed: files P-1k.O and $srcdir/P-1k.X differ" 1>&2
+       (diff -c P-1k.O $srcdir/P-1k.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-1k may have failed." 1>&2
+       $echo The command "cmp P-1k.O $srcdir/P-1k.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-1k.E || rm -f P-1k.E
+$xx ! '(' --version ')'  > NP-1k.O 2> NP-1k.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-1k failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-1k.O $srcdir/NP-1k.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-1k"; fi;;
+    1) $echo "Test NP-1k failed: files NP-1k.O and $srcdir/NP-1k.X differ" 1>&2
+       (diff -c NP-1k.O $srcdir/NP-1k.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-1k may have failed." 1>&2
+       $echo The command "cmp NP-1k.O $srcdir/NP-1k.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-1k.E || rm -f NP-1k.E
+$xx ! ! '(' --version ')'  > NNP-1k.O 2> NNP-1k.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-1k failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-1k.O $srcdir/NNP-1k.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-1k"; fi;;
+    1) $echo "Test NNP-1k failed: files NNP-1k.O and $srcdir/NNP-1k.X differ" 1>&2
+       (diff -c NNP-1k.O $srcdir/NNP-1k.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-1k may have failed." 1>&2
+       $echo The command "cmp NNP-1k.O $srcdir/NNP-1k.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-1k.E || rm -f NNP-1k.E
+$xx ! t = t  > N-streq-1.O 2> N-streq-1.E
 code=$?
 if test $code != 1; then
   $echo "Test N-streq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -378,25 +990,61 @@ else
   esac
 fi
 test -s N-streq-1.E || rm -f N-streq-1.E
-$xx ! ! '(' t = t ')'  > NN-streq-1.O 2> NN-streq-1.E
+$xx '(' t = t ')'  > P-streq-1.O 2> P-streq-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-streq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-streq-1.O $srcdir/P-streq-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-streq-1"; fi;;
+    1) $echo "Test P-streq-1 failed: files P-streq-1.O and $srcdir/P-streq-1.X differ" 1>&2
+       (diff -c P-streq-1.O $srcdir/P-streq-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-streq-1 may have failed." 1>&2
+       $echo The command "cmp P-streq-1.O $srcdir/P-streq-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-streq-1.E || rm -f P-streq-1.E
+$xx ! '(' t = t ')'  > NP-streq-1.O 2> NP-streq-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-streq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-streq-1.O $srcdir/NP-streq-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-streq-1"; fi;;
+    1) $echo "Test NP-streq-1 failed: files NP-streq-1.O and $srcdir/NP-streq-1.X differ" 1>&2
+       (diff -c NP-streq-1.O $srcdir/NP-streq-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-streq-1 may have failed." 1>&2
+       $echo The command "cmp NP-streq-1.O $srcdir/NP-streq-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-streq-1.E || rm -f NP-streq-1.E
+$xx ! ! '(' t = t ')'  > NNP-streq-1.O 2> NNP-streq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-streq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-streq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-streq-1.O $srcdir/NN-streq-1.X > /dev/null 2>&1
+  cmp NNP-streq-1.O $srcdir/NNP-streq-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-streq-1"; fi;;
-    1) $echo "Test NN-streq-1 failed: files NN-streq-1.O and $srcdir/NN-streq-1.X differ" 1>&2
-       (diff -c NN-streq-1.O $srcdir/NN-streq-1.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-streq-1"; fi;;
+    1) $echo "Test NNP-streq-1 failed: files NNP-streq-1.O and $srcdir/NNP-streq-1.X differ" 1>&2
+       (diff -c NNP-streq-1.O $srcdir/NNP-streq-1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-streq-1 may have failed." 1>&2
-       $echo The command "cmp NN-streq-1.O $srcdir/NN-streq-1.X" failed. 1>&2
+    2) $echo "Test NNP-streq-1 may have failed." 1>&2
+       $echo The command "cmp NNP-streq-1.O $srcdir/NNP-streq-1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-streq-1.E || rm -f NN-streq-1.E
-$xx ! '(' t = f ')'  > N-streq-2.O 2> N-streq-2.E
+test -s NNP-streq-1.E || rm -f NNP-streq-1.E
+$xx ! t = f  > N-streq-2.O 2> N-streq-2.E
 code=$?
 if test $code != 0; then
   $echo "Test N-streq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -414,25 +1062,295 @@ else
   esac
 fi
 test -s N-streq-2.E || rm -f N-streq-2.E
-$xx ! ! '(' t = f ')'  > NN-streq-2.O 2> NN-streq-2.E
+$xx '(' t = f ')'  > P-streq-2.O 2> P-streq-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-streq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-streq-2.O $srcdir/P-streq-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-streq-2"; fi;;
+    1) $echo "Test P-streq-2 failed: files P-streq-2.O and $srcdir/P-streq-2.X differ" 1>&2
+       (diff -c P-streq-2.O $srcdir/P-streq-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-streq-2 may have failed." 1>&2
+       $echo The command "cmp P-streq-2.O $srcdir/P-streq-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-streq-2.E || rm -f P-streq-2.E
+$xx ! '(' t = f ')'  > NP-streq-2.O 2> NP-streq-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-streq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-streq-2.O $srcdir/NP-streq-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-streq-2"; fi;;
+    1) $echo "Test NP-streq-2 failed: files NP-streq-2.O and $srcdir/NP-streq-2.X differ" 1>&2
+       (diff -c NP-streq-2.O $srcdir/NP-streq-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-streq-2 may have failed." 1>&2
+       $echo The command "cmp NP-streq-2.O $srcdir/NP-streq-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-streq-2.E || rm -f NP-streq-2.E
+$xx ! ! '(' t = f ')'  > NNP-streq-2.O 2> NNP-streq-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-streq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-streq-2.O $srcdir/NNP-streq-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-streq-2"; fi;;
+    1) $echo "Test NNP-streq-2 failed: files NNP-streq-2.O and $srcdir/NNP-streq-2.X differ" 1>&2
+       (diff -c NNP-streq-2.O $srcdir/NNP-streq-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-streq-2 may have failed." 1>&2
+       $echo The command "cmp NNP-streq-2.O $srcdir/NNP-streq-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-streq-2.E || rm -f NNP-streq-2.E
+$xx ! ! = !  > N-streq-3.O 2> N-streq-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-streq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-streq-3.O $srcdir/N-streq-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-streq-3"; fi;;
+    1) $echo "Test N-streq-3 failed: files N-streq-3.O and $srcdir/N-streq-3.X differ" 1>&2
+       (diff -c N-streq-3.O $srcdir/N-streq-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-streq-3 may have failed." 1>&2
+       $echo The command "cmp N-streq-3.O $srcdir/N-streq-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-streq-3.E || rm -f N-streq-3.E
+$xx '(' ! = ! ')'  > P-streq-3.O 2> P-streq-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-streq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-streq-3.O $srcdir/P-streq-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-streq-3"; fi;;
+    1) $echo "Test P-streq-3 failed: files P-streq-3.O and $srcdir/P-streq-3.X differ" 1>&2
+       (diff -c P-streq-3.O $srcdir/P-streq-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-streq-3 may have failed." 1>&2
+       $echo The command "cmp P-streq-3.O $srcdir/P-streq-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-streq-3.E || rm -f P-streq-3.E
+$xx ! '(' ! = ! ')'  > NP-streq-3.O 2> NP-streq-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-streq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-streq-3.O $srcdir/NP-streq-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-streq-3"; fi;;
+    1) $echo "Test NP-streq-3 failed: files NP-streq-3.O and $srcdir/NP-streq-3.X differ" 1>&2
+       (diff -c NP-streq-3.O $srcdir/NP-streq-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-streq-3 may have failed." 1>&2
+       $echo The command "cmp NP-streq-3.O $srcdir/NP-streq-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-streq-3.E || rm -f NP-streq-3.E
+$xx ! ! '(' ! = ! ')'  > NNP-streq-3.O 2> NNP-streq-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-streq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-streq-3.O $srcdir/NNP-streq-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-streq-3"; fi;;
+    1) $echo "Test NNP-streq-3 failed: files NNP-streq-3.O and $srcdir/NNP-streq-3.X differ" 1>&2
+       (diff -c NNP-streq-3.O $srcdir/NNP-streq-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-streq-3 may have failed." 1>&2
+       $echo The command "cmp NNP-streq-3.O $srcdir/NNP-streq-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-streq-3.E || rm -f NNP-streq-3.E
+$xx ! = = =  > N-streq-4.O 2> N-streq-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-streq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-streq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-streq-2.O $srcdir/NN-streq-2.X > /dev/null 2>&1
+  cmp N-streq-4.O $srcdir/N-streq-4.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-streq-2"; fi;;
-    1) $echo "Test NN-streq-2 failed: files NN-streq-2.O and $srcdir/NN-streq-2.X differ" 1>&2
-       (diff -c NN-streq-2.O $srcdir/NN-streq-2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed N-streq-4"; fi;;
+    1) $echo "Test N-streq-4 failed: files N-streq-4.O and $srcdir/N-streq-4.X differ" 1>&2
+       (diff -c N-streq-4.O $srcdir/N-streq-4.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-streq-2 may have failed." 1>&2
-       $echo The command "cmp NN-streq-2.O $srcdir/NN-streq-2.X" failed. 1>&2
+    2) $echo "Test N-streq-4 may have failed." 1>&2
+       $echo The command "cmp N-streq-4.O $srcdir/N-streq-4.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-streq-2.E || rm -f NN-streq-2.E
-$xx ! '(' t != t ')'  > N-strne-1.O 2> N-strne-1.E
+test -s N-streq-4.E || rm -f N-streq-4.E
+$xx '(' = = = ')'  > P-streq-4.O 2> P-streq-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-streq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-streq-4.O $srcdir/P-streq-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-streq-4"; fi;;
+    1) $echo "Test P-streq-4 failed: files P-streq-4.O and $srcdir/P-streq-4.X differ" 1>&2
+       (diff -c P-streq-4.O $srcdir/P-streq-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-streq-4 may have failed." 1>&2
+       $echo The command "cmp P-streq-4.O $srcdir/P-streq-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-streq-4.E || rm -f P-streq-4.E
+$xx ! '(' = = = ')'  > NP-streq-4.O 2> NP-streq-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-streq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-streq-4.O $srcdir/NP-streq-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-streq-4"; fi;;
+    1) $echo "Test NP-streq-4 failed: files NP-streq-4.O and $srcdir/NP-streq-4.X differ" 1>&2
+       (diff -c NP-streq-4.O $srcdir/NP-streq-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-streq-4 may have failed." 1>&2
+       $echo The command "cmp NP-streq-4.O $srcdir/NP-streq-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-streq-4.E || rm -f NP-streq-4.E
+$xx ! ! '(' = = = ')'  > NNP-streq-4.O 2> NNP-streq-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-streq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-streq-4.O $srcdir/NNP-streq-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-streq-4"; fi;;
+    1) $echo "Test NNP-streq-4 failed: files NNP-streq-4.O and $srcdir/NNP-streq-4.X differ" 1>&2
+       (diff -c NNP-streq-4.O $srcdir/NNP-streq-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-streq-4 may have failed." 1>&2
+       $echo The command "cmp NNP-streq-4.O $srcdir/NNP-streq-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-streq-4.E || rm -f NNP-streq-4.E
+$xx ! '(' = '('  > N-streq-5.O 2> N-streq-5.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-streq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-streq-5.O $srcdir/N-streq-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-streq-5"; fi;;
+    1) $echo "Test N-streq-5 failed: files N-streq-5.O and $srcdir/N-streq-5.X differ" 1>&2
+       (diff -c N-streq-5.O $srcdir/N-streq-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-streq-5 may have failed." 1>&2
+       $echo The command "cmp N-streq-5.O $srcdir/N-streq-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-streq-5.E || rm -f N-streq-5.E
+$xx '(' '(' = '(' ')'  > P-streq-5.O 2> P-streq-5.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-streq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-streq-5.O $srcdir/P-streq-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-streq-5"; fi;;
+    1) $echo "Test P-streq-5 failed: files P-streq-5.O and $srcdir/P-streq-5.X differ" 1>&2
+       (diff -c P-streq-5.O $srcdir/P-streq-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-streq-5 may have failed." 1>&2
+       $echo The command "cmp P-streq-5.O $srcdir/P-streq-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-streq-5.E || rm -f P-streq-5.E
+$xx ! '(' '(' = '(' ')'  > NP-streq-5.O 2> NP-streq-5.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-streq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-streq-5.O $srcdir/NP-streq-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-streq-5"; fi;;
+    1) $echo "Test NP-streq-5 failed: files NP-streq-5.O and $srcdir/NP-streq-5.X differ" 1>&2
+       (diff -c NP-streq-5.O $srcdir/NP-streq-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-streq-5 may have failed." 1>&2
+       $echo The command "cmp NP-streq-5.O $srcdir/NP-streq-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-streq-5.E || rm -f NP-streq-5.E
+$xx ! ! '(' '(' = '(' ')'  > NNP-streq-5.O 2> NNP-streq-5.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-streq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-streq-5.O $srcdir/NNP-streq-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-streq-5"; fi;;
+    1) $echo "Test NNP-streq-5 failed: files NNP-streq-5.O and $srcdir/NNP-streq-5.X differ" 1>&2
+       (diff -c NNP-streq-5.O $srcdir/NNP-streq-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-streq-5 may have failed." 1>&2
+       $echo The command "cmp NNP-streq-5.O $srcdir/NNP-streq-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-streq-5.E || rm -f NNP-streq-5.E
+$xx ! '(' = ')'  > N-streq-6.O 2> N-streq-6.E
+code=$?
+if test $code != 0; then
+  $echo "Test N-streq-6 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-streq-6.O $srcdir/N-streq-6.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-streq-6"; fi;;
+    1) $echo "Test N-streq-6 failed: files N-streq-6.O and $srcdir/N-streq-6.X differ" 1>&2
+       (diff -c N-streq-6.O $srcdir/N-streq-6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-streq-6 may have failed." 1>&2
+       $echo The command "cmp N-streq-6.O $srcdir/N-streq-6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-streq-6.E || rm -f N-streq-6.E
+$xx ! t != t  > N-strne-1.O 2> N-strne-1.E
 code=$?
 if test $code != 0; then
   $echo "Test N-strne-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -450,25 +1368,61 @@ else
   esac
 fi
 test -s N-strne-1.E || rm -f N-strne-1.E
-$xx ! ! '(' t != t ')'  > NN-strne-1.O 2> NN-strne-1.E
+$xx '(' t != t ')'  > P-strne-1.O 2> P-strne-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-strne-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-strne-1.O $srcdir/P-strne-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-strne-1"; fi;;
+    1) $echo "Test P-strne-1 failed: files P-strne-1.O and $srcdir/P-strne-1.X differ" 1>&2
+       (diff -c P-strne-1.O $srcdir/P-strne-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-strne-1 may have failed." 1>&2
+       $echo The command "cmp P-strne-1.O $srcdir/P-strne-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-strne-1.E || rm -f P-strne-1.E
+$xx ! '(' t != t ')'  > NP-strne-1.O 2> NP-strne-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-strne-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-strne-1.O $srcdir/NP-strne-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-strne-1"; fi;;
+    1) $echo "Test NP-strne-1 failed: files NP-strne-1.O and $srcdir/NP-strne-1.X differ" 1>&2
+       (diff -c NP-strne-1.O $srcdir/NP-strne-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-strne-1 may have failed." 1>&2
+       $echo The command "cmp NP-strne-1.O $srcdir/NP-strne-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-strne-1.E || rm -f NP-strne-1.E
+$xx ! ! '(' t != t ')'  > NNP-strne-1.O 2> NNP-strne-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-strne-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-strne-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-strne-1.O $srcdir/NN-strne-1.X > /dev/null 2>&1
+  cmp NNP-strne-1.O $srcdir/NNP-strne-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-strne-1"; fi;;
-    1) $echo "Test NN-strne-1 failed: files NN-strne-1.O and $srcdir/NN-strne-1.X differ" 1>&2
-       (diff -c NN-strne-1.O $srcdir/NN-strne-1.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-strne-1"; fi;;
+    1) $echo "Test NNP-strne-1 failed: files NNP-strne-1.O and $srcdir/NNP-strne-1.X differ" 1>&2
+       (diff -c NNP-strne-1.O $srcdir/NNP-strne-1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-strne-1 may have failed." 1>&2
-       $echo The command "cmp NN-strne-1.O $srcdir/NN-strne-1.X" failed. 1>&2
+    2) $echo "Test NNP-strne-1 may have failed." 1>&2
+       $echo The command "cmp NNP-strne-1.O $srcdir/NNP-strne-1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-strne-1.E || rm -f NN-strne-1.E
-$xx ! '(' t != f ')'  > N-strne-2.O 2> N-strne-2.E
+test -s NNP-strne-1.E || rm -f NNP-strne-1.E
+$xx ! t != f  > N-strne-2.O 2> N-strne-2.E
 code=$?
 if test $code != 1; then
   $echo "Test N-strne-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -486,25 +1440,295 @@ else
   esac
 fi
 test -s N-strne-2.E || rm -f N-strne-2.E
-$xx ! ! '(' t != f ')'  > NN-strne-2.O 2> NN-strne-2.E
+$xx '(' t != f ')'  > P-strne-2.O 2> P-strne-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-strne-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-strne-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-strne-2.O $srcdir/NN-strne-2.X > /dev/null 2>&1
+  cmp P-strne-2.O $srcdir/P-strne-2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-strne-2"; fi;;
-    1) $echo "Test NN-strne-2 failed: files NN-strne-2.O and $srcdir/NN-strne-2.X differ" 1>&2
-       (diff -c NN-strne-2.O $srcdir/NN-strne-2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-strne-2"; fi;;
+    1) $echo "Test P-strne-2 failed: files P-strne-2.O and $srcdir/P-strne-2.X differ" 1>&2
+       (diff -c P-strne-2.O $srcdir/P-strne-2.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-strne-2 may have failed." 1>&2
-       $echo The command "cmp NN-strne-2.O $srcdir/NN-strne-2.X" failed. 1>&2
+    2) $echo "Test P-strne-2 may have failed." 1>&2
+       $echo The command "cmp P-strne-2.O $srcdir/P-strne-2.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-strne-2.E || rm -f NN-strne-2.E
-$xx ! '(' t -a t ')'  > N-and-1.O 2> N-and-1.E
+test -s P-strne-2.E || rm -f P-strne-2.E
+$xx ! '(' t != f ')'  > NP-strne-2.O 2> NP-strne-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-strne-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-strne-2.O $srcdir/NP-strne-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-strne-2"; fi;;
+    1) $echo "Test NP-strne-2 failed: files NP-strne-2.O and $srcdir/NP-strne-2.X differ" 1>&2
+       (diff -c NP-strne-2.O $srcdir/NP-strne-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-strne-2 may have failed." 1>&2
+       $echo The command "cmp NP-strne-2.O $srcdir/NP-strne-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-strne-2.E || rm -f NP-strne-2.E
+$xx ! ! '(' t != f ')'  > NNP-strne-2.O 2> NNP-strne-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-strne-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-strne-2.O $srcdir/NNP-strne-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-strne-2"; fi;;
+    1) $echo "Test NNP-strne-2 failed: files NNP-strne-2.O and $srcdir/NNP-strne-2.X differ" 1>&2
+       (diff -c NNP-strne-2.O $srcdir/NNP-strne-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-strne-2 may have failed." 1>&2
+       $echo The command "cmp NNP-strne-2.O $srcdir/NNP-strne-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-strne-2.E || rm -f NNP-strne-2.E
+$xx ! ! != !  > N-strne-3.O 2> N-strne-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test N-strne-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-strne-3.O $srcdir/N-strne-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-strne-3"; fi;;
+    1) $echo "Test N-strne-3 failed: files N-strne-3.O and $srcdir/N-strne-3.X differ" 1>&2
+       (diff -c N-strne-3.O $srcdir/N-strne-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-strne-3 may have failed." 1>&2
+       $echo The command "cmp N-strne-3.O $srcdir/N-strne-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-strne-3.E || rm -f N-strne-3.E
+$xx '(' ! != ! ')'  > P-strne-3.O 2> P-strne-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-strne-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-strne-3.O $srcdir/P-strne-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-strne-3"; fi;;
+    1) $echo "Test P-strne-3 failed: files P-strne-3.O and $srcdir/P-strne-3.X differ" 1>&2
+       (diff -c P-strne-3.O $srcdir/P-strne-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-strne-3 may have failed." 1>&2
+       $echo The command "cmp P-strne-3.O $srcdir/P-strne-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-strne-3.E || rm -f P-strne-3.E
+$xx ! '(' ! != ! ')'  > NP-strne-3.O 2> NP-strne-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-strne-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-strne-3.O $srcdir/NP-strne-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-strne-3"; fi;;
+    1) $echo "Test NP-strne-3 failed: files NP-strne-3.O and $srcdir/NP-strne-3.X differ" 1>&2
+       (diff -c NP-strne-3.O $srcdir/NP-strne-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-strne-3 may have failed." 1>&2
+       $echo The command "cmp NP-strne-3.O $srcdir/NP-strne-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-strne-3.E || rm -f NP-strne-3.E
+$xx ! ! '(' ! != ! ')'  > NNP-strne-3.O 2> NNP-strne-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-strne-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-strne-3.O $srcdir/NNP-strne-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-strne-3"; fi;;
+    1) $echo "Test NNP-strne-3 failed: files NNP-strne-3.O and $srcdir/NNP-strne-3.X differ" 1>&2
+       (diff -c NNP-strne-3.O $srcdir/NNP-strne-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-strne-3 may have failed." 1>&2
+       $echo The command "cmp NNP-strne-3.O $srcdir/NNP-strne-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-strne-3.E || rm -f NNP-strne-3.E
+$xx ! = != =  > N-strne-4.O 2> N-strne-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test N-strne-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-strne-4.O $srcdir/N-strne-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-strne-4"; fi;;
+    1) $echo "Test N-strne-4 failed: files N-strne-4.O and $srcdir/N-strne-4.X differ" 1>&2
+       (diff -c N-strne-4.O $srcdir/N-strne-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-strne-4 may have failed." 1>&2
+       $echo The command "cmp N-strne-4.O $srcdir/N-strne-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-strne-4.E || rm -f N-strne-4.E
+$xx '(' = != = ')'  > P-strne-4.O 2> P-strne-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-strne-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-strne-4.O $srcdir/P-strne-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-strne-4"; fi;;
+    1) $echo "Test P-strne-4 failed: files P-strne-4.O and $srcdir/P-strne-4.X differ" 1>&2
+       (diff -c P-strne-4.O $srcdir/P-strne-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-strne-4 may have failed." 1>&2
+       $echo The command "cmp P-strne-4.O $srcdir/P-strne-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-strne-4.E || rm -f P-strne-4.E
+$xx ! '(' = != = ')'  > NP-strne-4.O 2> NP-strne-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-strne-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-strne-4.O $srcdir/NP-strne-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-strne-4"; fi;;
+    1) $echo "Test NP-strne-4 failed: files NP-strne-4.O and $srcdir/NP-strne-4.X differ" 1>&2
+       (diff -c NP-strne-4.O $srcdir/NP-strne-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-strne-4 may have failed." 1>&2
+       $echo The command "cmp NP-strne-4.O $srcdir/NP-strne-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-strne-4.E || rm -f NP-strne-4.E
+$xx ! ! '(' = != = ')'  > NNP-strne-4.O 2> NNP-strne-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-strne-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-strne-4.O $srcdir/NNP-strne-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-strne-4"; fi;;
+    1) $echo "Test NNP-strne-4 failed: files NNP-strne-4.O and $srcdir/NNP-strne-4.X differ" 1>&2
+       (diff -c NNP-strne-4.O $srcdir/NNP-strne-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-strne-4 may have failed." 1>&2
+       $echo The command "cmp NNP-strne-4.O $srcdir/NNP-strne-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-strne-4.E || rm -f NNP-strne-4.E
+$xx ! '(' != '('  > N-strne-5.O 2> N-strne-5.E
+code=$?
+if test $code != 0; then
+  $echo "Test N-strne-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-strne-5.O $srcdir/N-strne-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-strne-5"; fi;;
+    1) $echo "Test N-strne-5 failed: files N-strne-5.O and $srcdir/N-strne-5.X differ" 1>&2
+       (diff -c N-strne-5.O $srcdir/N-strne-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-strne-5 may have failed." 1>&2
+       $echo The command "cmp N-strne-5.O $srcdir/N-strne-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-strne-5.E || rm -f N-strne-5.E
+$xx '(' '(' != '(' ')'  > P-strne-5.O 2> P-strne-5.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-strne-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-strne-5.O $srcdir/P-strne-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-strne-5"; fi;;
+    1) $echo "Test P-strne-5 failed: files P-strne-5.O and $srcdir/P-strne-5.X differ" 1>&2
+       (diff -c P-strne-5.O $srcdir/P-strne-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-strne-5 may have failed." 1>&2
+       $echo The command "cmp P-strne-5.O $srcdir/P-strne-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-strne-5.E || rm -f P-strne-5.E
+$xx ! '(' '(' != '(' ')'  > NP-strne-5.O 2> NP-strne-5.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-strne-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-strne-5.O $srcdir/NP-strne-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-strne-5"; fi;;
+    1) $echo "Test NP-strne-5 failed: files NP-strne-5.O and $srcdir/NP-strne-5.X differ" 1>&2
+       (diff -c NP-strne-5.O $srcdir/NP-strne-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-strne-5 may have failed." 1>&2
+       $echo The command "cmp NP-strne-5.O $srcdir/NP-strne-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-strne-5.E || rm -f NP-strne-5.E
+$xx ! ! '(' '(' != '(' ')'  > NNP-strne-5.O 2> NNP-strne-5.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-strne-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-strne-5.O $srcdir/NNP-strne-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-strne-5"; fi;;
+    1) $echo "Test NNP-strne-5 failed: files NNP-strne-5.O and $srcdir/NNP-strne-5.X differ" 1>&2
+       (diff -c NNP-strne-5.O $srcdir/NNP-strne-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-strne-5 may have failed." 1>&2
+       $echo The command "cmp NNP-strne-5.O $srcdir/NNP-strne-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-strne-5.E || rm -f NNP-strne-5.E
+$xx ! '(' != ')'  > N-strne-6.O 2> N-strne-6.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-strne-6 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-strne-6.O $srcdir/N-strne-6.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-strne-6"; fi;;
+    1) $echo "Test N-strne-6 failed: files N-strne-6.O and $srcdir/N-strne-6.X differ" 1>&2
+       (diff -c N-strne-6.O $srcdir/N-strne-6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-strne-6 may have failed." 1>&2
+       $echo The command "cmp N-strne-6.O $srcdir/N-strne-6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-strne-6.E || rm -f N-strne-6.E
+$xx ! t -a t  > N-and-1.O 2> N-and-1.E
 code=$?
 if test $code != 1; then
   $echo "Test N-and-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -522,25 +1746,61 @@ else
   esac
 fi
 test -s N-and-1.E || rm -f N-and-1.E
-$xx ! ! '(' t -a t ')'  > NN-and-1.O 2> NN-and-1.E
+$xx '(' t -a t ')'  > P-and-1.O 2> P-and-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-and-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-and-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-and-1.O $srcdir/NN-and-1.X > /dev/null 2>&1
+  cmp P-and-1.O $srcdir/P-and-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-and-1"; fi;;
-    1) $echo "Test NN-and-1 failed: files NN-and-1.O and $srcdir/NN-and-1.X differ" 1>&2
-       (diff -c NN-and-1.O $srcdir/NN-and-1.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-and-1"; fi;;
+    1) $echo "Test P-and-1 failed: files P-and-1.O and $srcdir/P-and-1.X differ" 1>&2
+       (diff -c P-and-1.O $srcdir/P-and-1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-and-1 may have failed." 1>&2
-       $echo The command "cmp NN-and-1.O $srcdir/NN-and-1.X" failed. 1>&2
+    2) $echo "Test P-and-1 may have failed." 1>&2
+       $echo The command "cmp P-and-1.O $srcdir/P-and-1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-and-1.E || rm -f NN-and-1.E
-$xx ! '(' "" -a t ')'  > N-and-2.O 2> N-and-2.E
+test -s P-and-1.E || rm -f P-and-1.E
+$xx ! '(' t -a t ')'  > NP-and-1.O 2> NP-and-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-and-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-and-1.O $srcdir/NP-and-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-and-1"; fi;;
+    1) $echo "Test NP-and-1 failed: files NP-and-1.O and $srcdir/NP-and-1.X differ" 1>&2
+       (diff -c NP-and-1.O $srcdir/NP-and-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-and-1 may have failed." 1>&2
+       $echo The command "cmp NP-and-1.O $srcdir/NP-and-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-and-1.E || rm -f NP-and-1.E
+$xx ! ! '(' t -a t ')'  > NNP-and-1.O 2> NNP-and-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-and-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-and-1.O $srcdir/NNP-and-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-and-1"; fi;;
+    1) $echo "Test NNP-and-1 failed: files NNP-and-1.O and $srcdir/NNP-and-1.X differ" 1>&2
+       (diff -c NNP-and-1.O $srcdir/NNP-and-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-and-1 may have failed." 1>&2
+       $echo The command "cmp NNP-and-1.O $srcdir/NNP-and-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-and-1.E || rm -f NNP-and-1.E
+$xx ! '' -a t  > N-and-2.O 2> N-and-2.E
 code=$?
 if test $code != 0; then
   $echo "Test N-and-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -558,25 +1818,61 @@ else
   esac
 fi
 test -s N-and-2.E || rm -f N-and-2.E
-$xx ! ! '(' "" -a t ')'  > NN-and-2.O 2> NN-and-2.E
+$xx '(' '' -a t ')'  > P-and-2.O 2> P-and-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-and-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-and-2.O $srcdir/P-and-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-and-2"; fi;;
+    1) $echo "Test P-and-2 failed: files P-and-2.O and $srcdir/P-and-2.X differ" 1>&2
+       (diff -c P-and-2.O $srcdir/P-and-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-and-2 may have failed." 1>&2
+       $echo The command "cmp P-and-2.O $srcdir/P-and-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-and-2.E || rm -f P-and-2.E
+$xx ! '(' '' -a t ')'  > NP-and-2.O 2> NP-and-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-and-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-and-2.O $srcdir/NP-and-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-and-2"; fi;;
+    1) $echo "Test NP-and-2 failed: files NP-and-2.O and $srcdir/NP-and-2.X differ" 1>&2
+       (diff -c NP-and-2.O $srcdir/NP-and-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-and-2 may have failed." 1>&2
+       $echo The command "cmp NP-and-2.O $srcdir/NP-and-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-and-2.E || rm -f NP-and-2.E
+$xx ! ! '(' '' -a t ')'  > NNP-and-2.O 2> NNP-and-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-and-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-and-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-and-2.O $srcdir/NN-and-2.X > /dev/null 2>&1
+  cmp NNP-and-2.O $srcdir/NNP-and-2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-and-2"; fi;;
-    1) $echo "Test NN-and-2 failed: files NN-and-2.O and $srcdir/NN-and-2.X differ" 1>&2
-       (diff -c NN-and-2.O $srcdir/NN-and-2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-and-2"; fi;;
+    1) $echo "Test NNP-and-2 failed: files NNP-and-2.O and $srcdir/NNP-and-2.X differ" 1>&2
+       (diff -c NNP-and-2.O $srcdir/NNP-and-2.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-and-2 may have failed." 1>&2
-       $echo The command "cmp NN-and-2.O $srcdir/NN-and-2.X" failed. 1>&2
+    2) $echo "Test NNP-and-2 may have failed." 1>&2
+       $echo The command "cmp NNP-and-2.O $srcdir/NNP-and-2.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-and-2.E || rm -f NN-and-2.E
-$xx ! '(' t -a "" ')'  > N-and-3.O 2> N-and-3.E
+test -s NNP-and-2.E || rm -f NNP-and-2.E
+$xx ! t -a ''  > N-and-3.O 2> N-and-3.E
 code=$?
 if test $code != 0; then
   $echo "Test N-and-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -594,25 +1890,61 @@ else
   esac
 fi
 test -s N-and-3.E || rm -f N-and-3.E
-$xx ! ! '(' t -a "" ')'  > NN-and-3.O 2> NN-and-3.E
+$xx '(' t -a '' ')'  > P-and-3.O 2> P-and-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-and-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-and-3.O $srcdir/P-and-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-and-3"; fi;;
+    1) $echo "Test P-and-3 failed: files P-and-3.O and $srcdir/P-and-3.X differ" 1>&2
+       (diff -c P-and-3.O $srcdir/P-and-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-and-3 may have failed." 1>&2
+       $echo The command "cmp P-and-3.O $srcdir/P-and-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-and-3.E || rm -f P-and-3.E
+$xx ! '(' t -a '' ')'  > NP-and-3.O 2> NP-and-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-and-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-and-3.O $srcdir/NP-and-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-and-3"; fi;;
+    1) $echo "Test NP-and-3 failed: files NP-and-3.O and $srcdir/NP-and-3.X differ" 1>&2
+       (diff -c NP-and-3.O $srcdir/NP-and-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-and-3 may have failed." 1>&2
+       $echo The command "cmp NP-and-3.O $srcdir/NP-and-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-and-3.E || rm -f NP-and-3.E
+$xx ! ! '(' t -a '' ')'  > NNP-and-3.O 2> NNP-and-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-and-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-and-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-and-3.O $srcdir/NN-and-3.X > /dev/null 2>&1
+  cmp NNP-and-3.O $srcdir/NNP-and-3.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-and-3"; fi;;
-    1) $echo "Test NN-and-3 failed: files NN-and-3.O and $srcdir/NN-and-3.X differ" 1>&2
-       (diff -c NN-and-3.O $srcdir/NN-and-3.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-and-3"; fi;;
+    1) $echo "Test NNP-and-3 failed: files NNP-and-3.O and $srcdir/NNP-and-3.X differ" 1>&2
+       (diff -c NNP-and-3.O $srcdir/NNP-and-3.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-and-3 may have failed." 1>&2
-       $echo The command "cmp NN-and-3.O $srcdir/NN-and-3.X" failed. 1>&2
+    2) $echo "Test NNP-and-3 may have failed." 1>&2
+       $echo The command "cmp NNP-and-3.O $srcdir/NNP-and-3.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-and-3.E || rm -f NN-and-3.E
-$xx ! '(' "" -a "" ')'  > N-and-4.O 2> N-and-4.E
+test -s NNP-and-3.E || rm -f NNP-and-3.E
+$xx ! '' -a ''  > N-and-4.O 2> N-and-4.E
 code=$?
 if test $code != 0; then
   $echo "Test N-and-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -630,25 +1962,61 @@ else
   esac
 fi
 test -s N-and-4.E || rm -f N-and-4.E
-$xx ! ! '(' "" -a "" ')'  > NN-and-4.O 2> NN-and-4.E
+$xx '(' '' -a '' ')'  > P-and-4.O 2> P-and-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-and-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-and-4.O $srcdir/P-and-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-and-4"; fi;;
+    1) $echo "Test P-and-4 failed: files P-and-4.O and $srcdir/P-and-4.X differ" 1>&2
+       (diff -c P-and-4.O $srcdir/P-and-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-and-4 may have failed." 1>&2
+       $echo The command "cmp P-and-4.O $srcdir/P-and-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-and-4.E || rm -f P-and-4.E
+$xx ! '(' '' -a '' ')'  > NP-and-4.O 2> NP-and-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-and-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-and-4.O $srcdir/NP-and-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-and-4"; fi;;
+    1) $echo "Test NP-and-4 failed: files NP-and-4.O and $srcdir/NP-and-4.X differ" 1>&2
+       (diff -c NP-and-4.O $srcdir/NP-and-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-and-4 may have failed." 1>&2
+       $echo The command "cmp NP-and-4.O $srcdir/NP-and-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-and-4.E || rm -f NP-and-4.E
+$xx ! ! '(' '' -a '' ')'  > NNP-and-4.O 2> NNP-and-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-and-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-and-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-and-4.O $srcdir/NN-and-4.X > /dev/null 2>&1
+  cmp NNP-and-4.O $srcdir/NNP-and-4.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-and-4"; fi;;
-    1) $echo "Test NN-and-4 failed: files NN-and-4.O and $srcdir/NN-and-4.X differ" 1>&2
-       (diff -c NN-and-4.O $srcdir/NN-and-4.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-and-4"; fi;;
+    1) $echo "Test NNP-and-4 failed: files NNP-and-4.O and $srcdir/NNP-and-4.X differ" 1>&2
+       (diff -c NNP-and-4.O $srcdir/NNP-and-4.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-and-4 may have failed." 1>&2
-       $echo The command "cmp NN-and-4.O $srcdir/NN-and-4.X" failed. 1>&2
+    2) $echo "Test NNP-and-4 may have failed." 1>&2
+       $echo The command "cmp NNP-and-4.O $srcdir/NNP-and-4.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-and-4.E || rm -f NN-and-4.E
-$xx ! '(' t -o t ')'  > N-or-1.O 2> N-or-1.E
+test -s NNP-and-4.E || rm -f NNP-and-4.E
+$xx ! t -o t  > N-or-1.O 2> N-or-1.E
 code=$?
 if test $code != 1; then
   $echo "Test N-or-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -666,25 +2034,61 @@ else
   esac
 fi
 test -s N-or-1.E || rm -f N-or-1.E
-$xx ! ! '(' t -o t ')'  > NN-or-1.O 2> NN-or-1.E
+$xx '(' t -o t ')'  > P-or-1.O 2> P-or-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-or-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-or-1.O $srcdir/P-or-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-or-1"; fi;;
+    1) $echo "Test P-or-1 failed: files P-or-1.O and $srcdir/P-or-1.X differ" 1>&2
+       (diff -c P-or-1.O $srcdir/P-or-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-or-1 may have failed." 1>&2
+       $echo The command "cmp P-or-1.O $srcdir/P-or-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-or-1.E || rm -f P-or-1.E
+$xx ! '(' t -o t ')'  > NP-or-1.O 2> NP-or-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-or-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-or-1.O $srcdir/NP-or-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-or-1"; fi;;
+    1) $echo "Test NP-or-1 failed: files NP-or-1.O and $srcdir/NP-or-1.X differ" 1>&2
+       (diff -c NP-or-1.O $srcdir/NP-or-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-or-1 may have failed." 1>&2
+       $echo The command "cmp NP-or-1.O $srcdir/NP-or-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-or-1.E || rm -f NP-or-1.E
+$xx ! ! '(' t -o t ')'  > NNP-or-1.O 2> NNP-or-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-or-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-or-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-or-1.O $srcdir/NN-or-1.X > /dev/null 2>&1
+  cmp NNP-or-1.O $srcdir/NNP-or-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-or-1"; fi;;
-    1) $echo "Test NN-or-1 failed: files NN-or-1.O and $srcdir/NN-or-1.X differ" 1>&2
-       (diff -c NN-or-1.O $srcdir/NN-or-1.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-or-1"; fi;;
+    1) $echo "Test NNP-or-1 failed: files NNP-or-1.O and $srcdir/NNP-or-1.X differ" 1>&2
+       (diff -c NNP-or-1.O $srcdir/NNP-or-1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-or-1 may have failed." 1>&2
-       $echo The command "cmp NN-or-1.O $srcdir/NN-or-1.X" failed. 1>&2
+    2) $echo "Test NNP-or-1 may have failed." 1>&2
+       $echo The command "cmp NNP-or-1.O $srcdir/NNP-or-1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-or-1.E || rm -f NN-or-1.E
-$xx ! '(' "" -o t ')'  > N-or-2.O 2> N-or-2.E
+test -s NNP-or-1.E || rm -f NNP-or-1.E
+$xx ! '' -o t  > N-or-2.O 2> N-or-2.E
 code=$?
 if test $code != 1; then
   $echo "Test N-or-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -702,25 +2106,61 @@ else
   esac
 fi
 test -s N-or-2.E || rm -f N-or-2.E
-$xx ! ! '(' "" -o t ')'  > NN-or-2.O 2> NN-or-2.E
+$xx '(' '' -o t ')'  > P-or-2.O 2> P-or-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-or-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-or-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-or-2.O $srcdir/NN-or-2.X > /dev/null 2>&1
+  cmp P-or-2.O $srcdir/P-or-2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-or-2"; fi;;
-    1) $echo "Test NN-or-2 failed: files NN-or-2.O and $srcdir/NN-or-2.X differ" 1>&2
-       (diff -c NN-or-2.O $srcdir/NN-or-2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-or-2"; fi;;
+    1) $echo "Test P-or-2 failed: files P-or-2.O and $srcdir/P-or-2.X differ" 1>&2
+       (diff -c P-or-2.O $srcdir/P-or-2.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-or-2 may have failed." 1>&2
-       $echo The command "cmp NN-or-2.O $srcdir/NN-or-2.X" failed. 1>&2
+    2) $echo "Test P-or-2 may have failed." 1>&2
+       $echo The command "cmp P-or-2.O $srcdir/P-or-2.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-or-2.E || rm -f NN-or-2.E
-$xx ! '(' t -o "" ')'  > N-or-3.O 2> N-or-3.E
+test -s P-or-2.E || rm -f P-or-2.E
+$xx ! '(' '' -o t ')'  > NP-or-2.O 2> NP-or-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-or-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-or-2.O $srcdir/NP-or-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-or-2"; fi;;
+    1) $echo "Test NP-or-2 failed: files NP-or-2.O and $srcdir/NP-or-2.X differ" 1>&2
+       (diff -c NP-or-2.O $srcdir/NP-or-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-or-2 may have failed." 1>&2
+       $echo The command "cmp NP-or-2.O $srcdir/NP-or-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-or-2.E || rm -f NP-or-2.E
+$xx ! ! '(' '' -o t ')'  > NNP-or-2.O 2> NNP-or-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-or-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-or-2.O $srcdir/NNP-or-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-or-2"; fi;;
+    1) $echo "Test NNP-or-2 failed: files NNP-or-2.O and $srcdir/NNP-or-2.X differ" 1>&2
+       (diff -c NNP-or-2.O $srcdir/NNP-or-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-or-2 may have failed." 1>&2
+       $echo The command "cmp NNP-or-2.O $srcdir/NNP-or-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-or-2.E || rm -f NNP-or-2.E
+$xx ! t -o ''  > N-or-3.O 2> N-or-3.E
 code=$?
 if test $code != 1; then
   $echo "Test N-or-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -738,25 +2178,61 @@ else
   esac
 fi
 test -s N-or-3.E || rm -f N-or-3.E
-$xx ! ! '(' t -o "" ')'  > NN-or-3.O 2> NN-or-3.E
+$xx '(' t -o '' ')'  > P-or-3.O 2> P-or-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-or-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-or-3.O $srcdir/P-or-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-or-3"; fi;;
+    1) $echo "Test P-or-3 failed: files P-or-3.O and $srcdir/P-or-3.X differ" 1>&2
+       (diff -c P-or-3.O $srcdir/P-or-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-or-3 may have failed." 1>&2
+       $echo The command "cmp P-or-3.O $srcdir/P-or-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-or-3.E || rm -f P-or-3.E
+$xx ! '(' t -o '' ')'  > NP-or-3.O 2> NP-or-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-or-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-or-3.O $srcdir/NP-or-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-or-3"; fi;;
+    1) $echo "Test NP-or-3 failed: files NP-or-3.O and $srcdir/NP-or-3.X differ" 1>&2
+       (diff -c NP-or-3.O $srcdir/NP-or-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-or-3 may have failed." 1>&2
+       $echo The command "cmp NP-or-3.O $srcdir/NP-or-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-or-3.E || rm -f NP-or-3.E
+$xx ! ! '(' t -o '' ')'  > NNP-or-3.O 2> NNP-or-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-or-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-or-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-or-3.O $srcdir/NN-or-3.X > /dev/null 2>&1
+  cmp NNP-or-3.O $srcdir/NNP-or-3.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-or-3"; fi;;
-    1) $echo "Test NN-or-3 failed: files NN-or-3.O and $srcdir/NN-or-3.X differ" 1>&2
-       (diff -c NN-or-3.O $srcdir/NN-or-3.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-or-3"; fi;;
+    1) $echo "Test NNP-or-3 failed: files NNP-or-3.O and $srcdir/NNP-or-3.X differ" 1>&2
+       (diff -c NNP-or-3.O $srcdir/NNP-or-3.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-or-3 may have failed." 1>&2
-       $echo The command "cmp NN-or-3.O $srcdir/NN-or-3.X" failed. 1>&2
+    2) $echo "Test NNP-or-3 may have failed." 1>&2
+       $echo The command "cmp NNP-or-3.O $srcdir/NNP-or-3.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-or-3.E || rm -f NN-or-3.E
-$xx ! '(' "" -o "" ')'  > N-or-4.O 2> N-or-4.E
+test -s NNP-or-3.E || rm -f NNP-or-3.E
+$xx ! '' -o ''  > N-or-4.O 2> N-or-4.E
 code=$?
 if test $code != 0; then
   $echo "Test N-or-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -774,25 +2250,61 @@ else
   esac
 fi
 test -s N-or-4.E || rm -f N-or-4.E
-$xx ! ! '(' "" -o "" ')'  > NN-or-4.O 2> NN-or-4.E
+$xx '(' '' -o '' ')'  > P-or-4.O 2> P-or-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-or-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-or-4.O $srcdir/P-or-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-or-4"; fi;;
+    1) $echo "Test P-or-4 failed: files P-or-4.O and $srcdir/P-or-4.X differ" 1>&2
+       (diff -c P-or-4.O $srcdir/P-or-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-or-4 may have failed." 1>&2
+       $echo The command "cmp P-or-4.O $srcdir/P-or-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-or-4.E || rm -f P-or-4.E
+$xx ! '(' '' -o '' ')'  > NP-or-4.O 2> NP-or-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-or-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-or-4.O $srcdir/NP-or-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-or-4"; fi;;
+    1) $echo "Test NP-or-4 failed: files NP-or-4.O and $srcdir/NP-or-4.X differ" 1>&2
+       (diff -c NP-or-4.O $srcdir/NP-or-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-or-4 may have failed." 1>&2
+       $echo The command "cmp NP-or-4.O $srcdir/NP-or-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-or-4.E || rm -f NP-or-4.E
+$xx ! ! '(' '' -o '' ')'  > NNP-or-4.O 2> NNP-or-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-or-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-or-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-or-4.O $srcdir/NN-or-4.X > /dev/null 2>&1
+  cmp NNP-or-4.O $srcdir/NNP-or-4.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-or-4"; fi;;
-    1) $echo "Test NN-or-4 failed: files NN-or-4.O and $srcdir/NN-or-4.X differ" 1>&2
-       (diff -c NN-or-4.O $srcdir/NN-or-4.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-or-4"; fi;;
+    1) $echo "Test NNP-or-4 failed: files NNP-or-4.O and $srcdir/NNP-or-4.X differ" 1>&2
+       (diff -c NNP-or-4.O $srcdir/NNP-or-4.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-or-4 may have failed." 1>&2
-       $echo The command "cmp NN-or-4.O $srcdir/NN-or-4.X" failed. 1>&2
+    2) $echo "Test NNP-or-4 may have failed." 1>&2
+       $echo The command "cmp NNP-or-4.O $srcdir/NNP-or-4.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-or-4.E || rm -f NN-or-4.E
-$xx ! '(' 9 -eq 9 ')'  > N-eq-1.O 2> N-eq-1.E
+test -s NNP-or-4.E || rm -f NNP-or-4.E
+$xx ! 9 -eq 9  > N-eq-1.O 2> N-eq-1.E
 code=$?
 if test $code != 1; then
   $echo "Test N-eq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -810,25 +2322,61 @@ else
   esac
 fi
 test -s N-eq-1.E || rm -f N-eq-1.E
-$xx ! ! '(' 9 -eq 9 ')'  > NN-eq-1.O 2> NN-eq-1.E
+$xx '(' 9 -eq 9 ')'  > P-eq-1.O 2> P-eq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-eq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-eq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-eq-1.O $srcdir/NN-eq-1.X > /dev/null 2>&1
+  cmp P-eq-1.O $srcdir/P-eq-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-eq-1"; fi;;
-    1) $echo "Test NN-eq-1 failed: files NN-eq-1.O and $srcdir/NN-eq-1.X differ" 1>&2
-       (diff -c NN-eq-1.O $srcdir/NN-eq-1.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-eq-1"; fi;;
+    1) $echo "Test P-eq-1 failed: files P-eq-1.O and $srcdir/P-eq-1.X differ" 1>&2
+       (diff -c P-eq-1.O $srcdir/P-eq-1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-eq-1 may have failed." 1>&2
-       $echo The command "cmp NN-eq-1.O $srcdir/NN-eq-1.X" failed. 1>&2
+    2) $echo "Test P-eq-1 may have failed." 1>&2
+       $echo The command "cmp P-eq-1.O $srcdir/P-eq-1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-eq-1.E || rm -f NN-eq-1.E
-$xx ! '(' 0 -eq 0 ')'  > N-eq-2.O 2> N-eq-2.E
+test -s P-eq-1.E || rm -f P-eq-1.E
+$xx ! '(' 9 -eq 9 ')'  > NP-eq-1.O 2> NP-eq-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-eq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-eq-1.O $srcdir/NP-eq-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-eq-1"; fi;;
+    1) $echo "Test NP-eq-1 failed: files NP-eq-1.O and $srcdir/NP-eq-1.X differ" 1>&2
+       (diff -c NP-eq-1.O $srcdir/NP-eq-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-eq-1 may have failed." 1>&2
+       $echo The command "cmp NP-eq-1.O $srcdir/NP-eq-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-eq-1.E || rm -f NP-eq-1.E
+$xx ! ! '(' 9 -eq 9 ')'  > NNP-eq-1.O 2> NNP-eq-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-eq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-eq-1.O $srcdir/NNP-eq-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-eq-1"; fi;;
+    1) $echo "Test NNP-eq-1 failed: files NNP-eq-1.O and $srcdir/NNP-eq-1.X differ" 1>&2
+       (diff -c NNP-eq-1.O $srcdir/NNP-eq-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-eq-1 may have failed." 1>&2
+       $echo The command "cmp NNP-eq-1.O $srcdir/NNP-eq-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-eq-1.E || rm -f NNP-eq-1.E
+$xx ! 0 -eq 0  > N-eq-2.O 2> N-eq-2.E
 code=$?
 if test $code != 1; then
   $echo "Test N-eq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -846,25 +2394,61 @@ else
   esac
 fi
 test -s N-eq-2.E || rm -f N-eq-2.E
-$xx ! ! '(' 0 -eq 0 ')'  > NN-eq-2.O 2> NN-eq-2.E
+$xx '(' 0 -eq 0 ')'  > P-eq-2.O 2> P-eq-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-eq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-eq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-eq-2.O $srcdir/NN-eq-2.X > /dev/null 2>&1
+  cmp P-eq-2.O $srcdir/P-eq-2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-eq-2"; fi;;
-    1) $echo "Test NN-eq-2 failed: files NN-eq-2.O and $srcdir/NN-eq-2.X differ" 1>&2
-       (diff -c NN-eq-2.O $srcdir/NN-eq-2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-eq-2"; fi;;
+    1) $echo "Test P-eq-2 failed: files P-eq-2.O and $srcdir/P-eq-2.X differ" 1>&2
+       (diff -c P-eq-2.O $srcdir/P-eq-2.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-eq-2 may have failed." 1>&2
-       $echo The command "cmp NN-eq-2.O $srcdir/NN-eq-2.X" failed. 1>&2
+    2) $echo "Test P-eq-2 may have failed." 1>&2
+       $echo The command "cmp P-eq-2.O $srcdir/P-eq-2.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-eq-2.E || rm -f NN-eq-2.E
-$xx ! '(' 0 -eq 00 ')'  > N-eq-3.O 2> N-eq-3.E
+test -s P-eq-2.E || rm -f P-eq-2.E
+$xx ! '(' 0 -eq 0 ')'  > NP-eq-2.O 2> NP-eq-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-eq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-eq-2.O $srcdir/NP-eq-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-eq-2"; fi;;
+    1) $echo "Test NP-eq-2 failed: files NP-eq-2.O and $srcdir/NP-eq-2.X differ" 1>&2
+       (diff -c NP-eq-2.O $srcdir/NP-eq-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-eq-2 may have failed." 1>&2
+       $echo The command "cmp NP-eq-2.O $srcdir/NP-eq-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-eq-2.E || rm -f NP-eq-2.E
+$xx ! ! '(' 0 -eq 0 ')'  > NNP-eq-2.O 2> NNP-eq-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-eq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-eq-2.O $srcdir/NNP-eq-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-eq-2"; fi;;
+    1) $echo "Test NNP-eq-2 failed: files NNP-eq-2.O and $srcdir/NNP-eq-2.X differ" 1>&2
+       (diff -c NNP-eq-2.O $srcdir/NNP-eq-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-eq-2 may have failed." 1>&2
+       $echo The command "cmp NNP-eq-2.O $srcdir/NNP-eq-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-eq-2.E || rm -f NNP-eq-2.E
+$xx ! 0 -eq 00  > N-eq-3.O 2> N-eq-3.E
 code=$?
 if test $code != 1; then
   $echo "Test N-eq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -882,25 +2466,61 @@ else
   esac
 fi
 test -s N-eq-3.E || rm -f N-eq-3.E
-$xx ! ! '(' 0 -eq 00 ')'  > NN-eq-3.O 2> NN-eq-3.E
+$xx '(' 0 -eq 00 ')'  > P-eq-3.O 2> P-eq-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-eq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-eq-3.O $srcdir/P-eq-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-eq-3"; fi;;
+    1) $echo "Test P-eq-3 failed: files P-eq-3.O and $srcdir/P-eq-3.X differ" 1>&2
+       (diff -c P-eq-3.O $srcdir/P-eq-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-eq-3 may have failed." 1>&2
+       $echo The command "cmp P-eq-3.O $srcdir/P-eq-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-eq-3.E || rm -f P-eq-3.E
+$xx ! '(' 0 -eq 00 ')'  > NP-eq-3.O 2> NP-eq-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-eq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-eq-3.O $srcdir/NP-eq-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-eq-3"; fi;;
+    1) $echo "Test NP-eq-3 failed: files NP-eq-3.O and $srcdir/NP-eq-3.X differ" 1>&2
+       (diff -c NP-eq-3.O $srcdir/NP-eq-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-eq-3 may have failed." 1>&2
+       $echo The command "cmp NP-eq-3.O $srcdir/NP-eq-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-eq-3.E || rm -f NP-eq-3.E
+$xx ! ! '(' 0 -eq 00 ')'  > NNP-eq-3.O 2> NNP-eq-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-eq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-eq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-eq-3.O $srcdir/NN-eq-3.X > /dev/null 2>&1
+  cmp NNP-eq-3.O $srcdir/NNP-eq-3.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-eq-3"; fi;;
-    1) $echo "Test NN-eq-3 failed: files NN-eq-3.O and $srcdir/NN-eq-3.X differ" 1>&2
-       (diff -c NN-eq-3.O $srcdir/NN-eq-3.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-eq-3"; fi;;
+    1) $echo "Test NNP-eq-3 failed: files NNP-eq-3.O and $srcdir/NNP-eq-3.X differ" 1>&2
+       (diff -c NNP-eq-3.O $srcdir/NNP-eq-3.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-eq-3 may have failed." 1>&2
-       $echo The command "cmp NN-eq-3.O $srcdir/NN-eq-3.X" failed. 1>&2
+    2) $echo "Test NNP-eq-3 may have failed." 1>&2
+       $echo The command "cmp NNP-eq-3.O $srcdir/NNP-eq-3.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-eq-3.E || rm -f NN-eq-3.E
-$xx ! '(' 8 -eq 9 ')'  > N-eq-4.O 2> N-eq-4.E
+test -s NNP-eq-3.E || rm -f NNP-eq-3.E
+$xx ! 8 -eq 9  > N-eq-4.O 2> N-eq-4.E
 code=$?
 if test $code != 0; then
   $echo "Test N-eq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -918,25 +2538,61 @@ else
   esac
 fi
 test -s N-eq-4.E || rm -f N-eq-4.E
-$xx ! ! '(' 8 -eq 9 ')'  > NN-eq-4.O 2> NN-eq-4.E
+$xx '(' 8 -eq 9 ')'  > P-eq-4.O 2> P-eq-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-eq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-eq-4.O $srcdir/P-eq-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-eq-4"; fi;;
+    1) $echo "Test P-eq-4 failed: files P-eq-4.O and $srcdir/P-eq-4.X differ" 1>&2
+       (diff -c P-eq-4.O $srcdir/P-eq-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-eq-4 may have failed." 1>&2
+       $echo The command "cmp P-eq-4.O $srcdir/P-eq-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-eq-4.E || rm -f P-eq-4.E
+$xx ! '(' 8 -eq 9 ')'  > NP-eq-4.O 2> NP-eq-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-eq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-eq-4.O $srcdir/NP-eq-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-eq-4"; fi;;
+    1) $echo "Test NP-eq-4 failed: files NP-eq-4.O and $srcdir/NP-eq-4.X differ" 1>&2
+       (diff -c NP-eq-4.O $srcdir/NP-eq-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-eq-4 may have failed." 1>&2
+       $echo The command "cmp NP-eq-4.O $srcdir/NP-eq-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-eq-4.E || rm -f NP-eq-4.E
+$xx ! ! '(' 8 -eq 9 ')'  > NNP-eq-4.O 2> NNP-eq-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-eq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-eq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-eq-4.O $srcdir/NN-eq-4.X > /dev/null 2>&1
+  cmp NNP-eq-4.O $srcdir/NNP-eq-4.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-eq-4"; fi;;
-    1) $echo "Test NN-eq-4 failed: files NN-eq-4.O and $srcdir/NN-eq-4.X differ" 1>&2
-       (diff -c NN-eq-4.O $srcdir/NN-eq-4.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-eq-4"; fi;;
+    1) $echo "Test NNP-eq-4 failed: files NNP-eq-4.O and $srcdir/NNP-eq-4.X differ" 1>&2
+       (diff -c NNP-eq-4.O $srcdir/NNP-eq-4.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-eq-4 may have failed." 1>&2
-       $echo The command "cmp NN-eq-4.O $srcdir/NN-eq-4.X" failed. 1>&2
+    2) $echo "Test NNP-eq-4 may have failed." 1>&2
+       $echo The command "cmp NNP-eq-4.O $srcdir/NNP-eq-4.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-eq-4.E || rm -f NN-eq-4.E
-$xx ! '(' 1 -eq 0 ')'  > N-eq-5.O 2> N-eq-5.E
+test -s NNP-eq-4.E || rm -f NNP-eq-4.E
+$xx ! 1 -eq 0  > N-eq-5.O 2> N-eq-5.E
 code=$?
 if test $code != 0; then
   $echo "Test N-eq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -954,25 +2610,61 @@ else
   esac
 fi
 test -s N-eq-5.E || rm -f N-eq-5.E
-$xx ! ! '(' 1 -eq 0 ')'  > NN-eq-5.O 2> NN-eq-5.E
+$xx '(' 1 -eq 0 ')'  > P-eq-5.O 2> P-eq-5.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-eq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-eq-5.O $srcdir/P-eq-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-eq-5"; fi;;
+    1) $echo "Test P-eq-5 failed: files P-eq-5.O and $srcdir/P-eq-5.X differ" 1>&2
+       (diff -c P-eq-5.O $srcdir/P-eq-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-eq-5 may have failed." 1>&2
+       $echo The command "cmp P-eq-5.O $srcdir/P-eq-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-eq-5.E || rm -f P-eq-5.E
+$xx ! '(' 1 -eq 0 ')'  > NP-eq-5.O 2> NP-eq-5.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-eq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-eq-5.O $srcdir/NP-eq-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-eq-5"; fi;;
+    1) $echo "Test NP-eq-5 failed: files NP-eq-5.O and $srcdir/NP-eq-5.X differ" 1>&2
+       (diff -c NP-eq-5.O $srcdir/NP-eq-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-eq-5 may have failed." 1>&2
+       $echo The command "cmp NP-eq-5.O $srcdir/NP-eq-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-eq-5.E || rm -f NP-eq-5.E
+$xx ! ! '(' 1 -eq 0 ')'  > NNP-eq-5.O 2> NNP-eq-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-eq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-eq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-eq-5.O $srcdir/NN-eq-5.X > /dev/null 2>&1
+  cmp NNP-eq-5.O $srcdir/NNP-eq-5.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-eq-5"; fi;;
-    1) $echo "Test NN-eq-5 failed: files NN-eq-5.O and $srcdir/NN-eq-5.X differ" 1>&2
-       (diff -c NN-eq-5.O $srcdir/NN-eq-5.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-eq-5"; fi;;
+    1) $echo "Test NNP-eq-5 failed: files NNP-eq-5.O and $srcdir/NNP-eq-5.X differ" 1>&2
+       (diff -c NNP-eq-5.O $srcdir/NNP-eq-5.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-eq-5 may have failed." 1>&2
-       $echo The command "cmp NN-eq-5.O $srcdir/NN-eq-5.X" failed. 1>&2
+    2) $echo "Test NNP-eq-5 may have failed." 1>&2
+       $echo The command "cmp NNP-eq-5.O $srcdir/NNP-eq-5.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-eq-5.E || rm -f NN-eq-5.E
-$xx ! '(' 5 -gt 5 ')'  > N-gt-1.O 2> N-gt-1.E
+test -s NNP-eq-5.E || rm -f NNP-eq-5.E
+$xx ! 5 -gt 5  > N-gt-1.O 2> N-gt-1.E
 code=$?
 if test $code != 0; then
   $echo "Test N-gt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -990,25 +2682,61 @@ else
   esac
 fi
 test -s N-gt-1.E || rm -f N-gt-1.E
-$xx ! ! '(' 5 -gt 5 ')'  > NN-gt-1.O 2> NN-gt-1.E
+$xx '(' 5 -gt 5 ')'  > P-gt-1.O 2> P-gt-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-gt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-gt-1.O $srcdir/P-gt-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-gt-1"; fi;;
+    1) $echo "Test P-gt-1 failed: files P-gt-1.O and $srcdir/P-gt-1.X differ" 1>&2
+       (diff -c P-gt-1.O $srcdir/P-gt-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-gt-1 may have failed." 1>&2
+       $echo The command "cmp P-gt-1.O $srcdir/P-gt-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-gt-1.E || rm -f P-gt-1.E
+$xx ! '(' 5 -gt 5 ')'  > NP-gt-1.O 2> NP-gt-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-gt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-gt-1.O $srcdir/NP-gt-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-gt-1"; fi;;
+    1) $echo "Test NP-gt-1 failed: files NP-gt-1.O and $srcdir/NP-gt-1.X differ" 1>&2
+       (diff -c NP-gt-1.O $srcdir/NP-gt-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-gt-1 may have failed." 1>&2
+       $echo The command "cmp NP-gt-1.O $srcdir/NP-gt-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-gt-1.E || rm -f NP-gt-1.E
+$xx ! ! '(' 5 -gt 5 ')'  > NNP-gt-1.O 2> NNP-gt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-gt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-gt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-gt-1.O $srcdir/NN-gt-1.X > /dev/null 2>&1
+  cmp NNP-gt-1.O $srcdir/NNP-gt-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-gt-1"; fi;;
-    1) $echo "Test NN-gt-1 failed: files NN-gt-1.O and $srcdir/NN-gt-1.X differ" 1>&2
-       (diff -c NN-gt-1.O $srcdir/NN-gt-1.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-gt-1"; fi;;
+    1) $echo "Test NNP-gt-1 failed: files NNP-gt-1.O and $srcdir/NNP-gt-1.X differ" 1>&2
+       (diff -c NNP-gt-1.O $srcdir/NNP-gt-1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-gt-1 may have failed." 1>&2
-       $echo The command "cmp NN-gt-1.O $srcdir/NN-gt-1.X" failed. 1>&2
+    2) $echo "Test NNP-gt-1 may have failed." 1>&2
+       $echo The command "cmp NNP-gt-1.O $srcdir/NNP-gt-1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-gt-1.E || rm -f NN-gt-1.E
-$xx ! '(' 5 -gt 4 ')'  > N-gt-2.O 2> N-gt-2.E
+test -s NNP-gt-1.E || rm -f NNP-gt-1.E
+$xx ! 5 -gt 4  > N-gt-2.O 2> N-gt-2.E
 code=$?
 if test $code != 1; then
   $echo "Test N-gt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -1026,25 +2754,61 @@ else
   esac
 fi
 test -s N-gt-2.E || rm -f N-gt-2.E
-$xx ! ! '(' 5 -gt 4 ')'  > NN-gt-2.O 2> NN-gt-2.E
+$xx '(' 5 -gt 4 ')'  > P-gt-2.O 2> P-gt-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-gt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-gt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-gt-2.O $srcdir/P-gt-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-gt-2"; fi;;
+    1) $echo "Test P-gt-2 failed: files P-gt-2.O and $srcdir/P-gt-2.X differ" 1>&2
+       (diff -c P-gt-2.O $srcdir/P-gt-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-gt-2 may have failed." 1>&2
+       $echo The command "cmp P-gt-2.O $srcdir/P-gt-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-gt-2.E || rm -f P-gt-2.E
+$xx ! '(' 5 -gt 4 ')'  > NP-gt-2.O 2> NP-gt-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-gt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-gt-2.O $srcdir/NN-gt-2.X > /dev/null 2>&1
+  cmp NP-gt-2.O $srcdir/NP-gt-2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-gt-2"; fi;;
-    1) $echo "Test NN-gt-2 failed: files NN-gt-2.O and $srcdir/NN-gt-2.X differ" 1>&2
-       (diff -c NN-gt-2.O $srcdir/NN-gt-2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NP-gt-2"; fi;;
+    1) $echo "Test NP-gt-2 failed: files NP-gt-2.O and $srcdir/NP-gt-2.X differ" 1>&2
+       (diff -c NP-gt-2.O $srcdir/NP-gt-2.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-gt-2 may have failed." 1>&2
-       $echo The command "cmp NN-gt-2.O $srcdir/NN-gt-2.X" failed. 1>&2
+    2) $echo "Test NP-gt-2 may have failed." 1>&2
+       $echo The command "cmp NP-gt-2.O $srcdir/NP-gt-2.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-gt-2.E || rm -f NN-gt-2.E
-$xx ! '(' 4 -gt 5 ')'  > N-gt-3.O 2> N-gt-3.E
+test -s NP-gt-2.E || rm -f NP-gt-2.E
+$xx ! ! '(' 5 -gt 4 ')'  > NNP-gt-2.O 2> NNP-gt-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-gt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-gt-2.O $srcdir/NNP-gt-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-gt-2"; fi;;
+    1) $echo "Test NNP-gt-2 failed: files NNP-gt-2.O and $srcdir/NNP-gt-2.X differ" 1>&2
+       (diff -c NNP-gt-2.O $srcdir/NNP-gt-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-gt-2 may have failed." 1>&2
+       $echo The command "cmp NNP-gt-2.O $srcdir/NNP-gt-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-gt-2.E || rm -f NNP-gt-2.E
+$xx ! 4 -gt 5  > N-gt-3.O 2> N-gt-3.E
 code=$?
 if test $code != 0; then
   $echo "Test N-gt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -1062,25 +2826,61 @@ else
   esac
 fi
 test -s N-gt-3.E || rm -f N-gt-3.E
-$xx ! ! '(' 4 -gt 5 ')'  > NN-gt-3.O 2> NN-gt-3.E
+$xx '(' 4 -gt 5 ')'  > P-gt-3.O 2> P-gt-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-gt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-gt-3.O $srcdir/P-gt-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-gt-3"; fi;;
+    1) $echo "Test P-gt-3 failed: files P-gt-3.O and $srcdir/P-gt-3.X differ" 1>&2
+       (diff -c P-gt-3.O $srcdir/P-gt-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-gt-3 may have failed." 1>&2
+       $echo The command "cmp P-gt-3.O $srcdir/P-gt-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-gt-3.E || rm -f P-gt-3.E
+$xx ! '(' 4 -gt 5 ')'  > NP-gt-3.O 2> NP-gt-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-gt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-gt-3.O $srcdir/NP-gt-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-gt-3"; fi;;
+    1) $echo "Test NP-gt-3 failed: files NP-gt-3.O and $srcdir/NP-gt-3.X differ" 1>&2
+       (diff -c NP-gt-3.O $srcdir/NP-gt-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-gt-3 may have failed." 1>&2
+       $echo The command "cmp NP-gt-3.O $srcdir/NP-gt-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-gt-3.E || rm -f NP-gt-3.E
+$xx ! ! '(' 4 -gt 5 ')'  > NNP-gt-3.O 2> NNP-gt-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-gt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-gt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-gt-3.O $srcdir/NN-gt-3.X > /dev/null 2>&1
+  cmp NNP-gt-3.O $srcdir/NNP-gt-3.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-gt-3"; fi;;
-    1) $echo "Test NN-gt-3 failed: files NN-gt-3.O and $srcdir/NN-gt-3.X differ" 1>&2
-       (diff -c NN-gt-3.O $srcdir/NN-gt-3.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-gt-3"; fi;;
+    1) $echo "Test NNP-gt-3 failed: files NNP-gt-3.O and $srcdir/NNP-gt-3.X differ" 1>&2
+       (diff -c NNP-gt-3.O $srcdir/NNP-gt-3.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-gt-3 may have failed." 1>&2
-       $echo The command "cmp NN-gt-3.O $srcdir/NN-gt-3.X" failed. 1>&2
+    2) $echo "Test NNP-gt-3 may have failed." 1>&2
+       $echo The command "cmp NNP-gt-3.O $srcdir/NNP-gt-3.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-gt-3.E || rm -f NN-gt-3.E
-$xx ! '(' -1 -gt -2 ')'  > N-gt-4.O 2> N-gt-4.E
+test -s NNP-gt-3.E || rm -f NNP-gt-3.E
+$xx ! -1 -gt -2  > N-gt-4.O 2> N-gt-4.E
 code=$?
 if test $code != 1; then
   $echo "Test N-gt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -1098,25 +2898,61 @@ else
   esac
 fi
 test -s N-gt-4.E || rm -f N-gt-4.E
-$xx ! ! '(' -1 -gt -2 ')'  > NN-gt-4.O 2> NN-gt-4.E
+$xx '(' -1 -gt -2 ')'  > P-gt-4.O 2> P-gt-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-gt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-gt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-gt-4.O $srcdir/P-gt-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-gt-4"; fi;;
+    1) $echo "Test P-gt-4 failed: files P-gt-4.O and $srcdir/P-gt-4.X differ" 1>&2
+       (diff -c P-gt-4.O $srcdir/P-gt-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-gt-4 may have failed." 1>&2
+       $echo The command "cmp P-gt-4.O $srcdir/P-gt-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-gt-4.E || rm -f P-gt-4.E
+$xx ! '(' -1 -gt -2 ')'  > NP-gt-4.O 2> NP-gt-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-gt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-gt-4.O $srcdir/NN-gt-4.X > /dev/null 2>&1
+  cmp NP-gt-4.O $srcdir/NP-gt-4.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-gt-4"; fi;;
-    1) $echo "Test NN-gt-4 failed: files NN-gt-4.O and $srcdir/NN-gt-4.X differ" 1>&2
-       (diff -c NN-gt-4.O $srcdir/NN-gt-4.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NP-gt-4"; fi;;
+    1) $echo "Test NP-gt-4 failed: files NP-gt-4.O and $srcdir/NP-gt-4.X differ" 1>&2
+       (diff -c NP-gt-4.O $srcdir/NP-gt-4.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-gt-4 may have failed." 1>&2
-       $echo The command "cmp NN-gt-4.O $srcdir/NN-gt-4.X" failed. 1>&2
+    2) $echo "Test NP-gt-4 may have failed." 1>&2
+       $echo The command "cmp NP-gt-4.O $srcdir/NP-gt-4.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-gt-4.E || rm -f NN-gt-4.E
-$xx ! '(' 5 -lt 5 ')'  > N-lt-1.O 2> N-lt-1.E
+test -s NP-gt-4.E || rm -f NP-gt-4.E
+$xx ! ! '(' -1 -gt -2 ')'  > NNP-gt-4.O 2> NNP-gt-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-gt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-gt-4.O $srcdir/NNP-gt-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-gt-4"; fi;;
+    1) $echo "Test NNP-gt-4 failed: files NNP-gt-4.O and $srcdir/NNP-gt-4.X differ" 1>&2
+       (diff -c NNP-gt-4.O $srcdir/NNP-gt-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-gt-4 may have failed." 1>&2
+       $echo The command "cmp NNP-gt-4.O $srcdir/NNP-gt-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-gt-4.E || rm -f NNP-gt-4.E
+$xx ! 5 -lt 5  > N-lt-1.O 2> N-lt-1.E
 code=$?
 if test $code != 0; then
   $echo "Test N-lt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -1134,25 +2970,61 @@ else
   esac
 fi
 test -s N-lt-1.E || rm -f N-lt-1.E
-$xx ! ! '(' 5 -lt 5 ')'  > NN-lt-1.O 2> NN-lt-1.E
+$xx '(' 5 -lt 5 ')'  > P-lt-1.O 2> P-lt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-lt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-lt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-lt-1.O $srcdir/NN-lt-1.X > /dev/null 2>&1
+  cmp P-lt-1.O $srcdir/P-lt-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-lt-1"; fi;;
-    1) $echo "Test NN-lt-1 failed: files NN-lt-1.O and $srcdir/NN-lt-1.X differ" 1>&2
-       (diff -c NN-lt-1.O $srcdir/NN-lt-1.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-lt-1"; fi;;
+    1) $echo "Test P-lt-1 failed: files P-lt-1.O and $srcdir/P-lt-1.X differ" 1>&2
+       (diff -c P-lt-1.O $srcdir/P-lt-1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-lt-1 may have failed." 1>&2
-       $echo The command "cmp NN-lt-1.O $srcdir/NN-lt-1.X" failed. 1>&2
+    2) $echo "Test P-lt-1 may have failed." 1>&2
+       $echo The command "cmp P-lt-1.O $srcdir/P-lt-1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-lt-1.E || rm -f NN-lt-1.E
-$xx ! '(' 5 -lt 4 ')'  > N-lt-2.O 2> N-lt-2.E
+test -s P-lt-1.E || rm -f P-lt-1.E
+$xx ! '(' 5 -lt 5 ')'  > NP-lt-1.O 2> NP-lt-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-lt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-lt-1.O $srcdir/NP-lt-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-lt-1"; fi;;
+    1) $echo "Test NP-lt-1 failed: files NP-lt-1.O and $srcdir/NP-lt-1.X differ" 1>&2
+       (diff -c NP-lt-1.O $srcdir/NP-lt-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-lt-1 may have failed." 1>&2
+       $echo The command "cmp NP-lt-1.O $srcdir/NP-lt-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-lt-1.E || rm -f NP-lt-1.E
+$xx ! ! '(' 5 -lt 5 ')'  > NNP-lt-1.O 2> NNP-lt-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-lt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-lt-1.O $srcdir/NNP-lt-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-lt-1"; fi;;
+    1) $echo "Test NNP-lt-1 failed: files NNP-lt-1.O and $srcdir/NNP-lt-1.X differ" 1>&2
+       (diff -c NNP-lt-1.O $srcdir/NNP-lt-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-lt-1 may have failed." 1>&2
+       $echo The command "cmp NNP-lt-1.O $srcdir/NNP-lt-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-lt-1.E || rm -f NNP-lt-1.E
+$xx ! 5 -lt 4  > N-lt-2.O 2> N-lt-2.E
 code=$?
 if test $code != 0; then
   $echo "Test N-lt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -1170,25 +3042,61 @@ else
   esac
 fi
 test -s N-lt-2.E || rm -f N-lt-2.E
-$xx ! ! '(' 5 -lt 4 ')'  > NN-lt-2.O 2> NN-lt-2.E
+$xx '(' 5 -lt 4 ')'  > P-lt-2.O 2> P-lt-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-lt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-lt-2.O $srcdir/P-lt-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-lt-2"; fi;;
+    1) $echo "Test P-lt-2 failed: files P-lt-2.O and $srcdir/P-lt-2.X differ" 1>&2
+       (diff -c P-lt-2.O $srcdir/P-lt-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-lt-2 may have failed." 1>&2
+       $echo The command "cmp P-lt-2.O $srcdir/P-lt-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-lt-2.E || rm -f P-lt-2.E
+$xx ! '(' 5 -lt 4 ')'  > NP-lt-2.O 2> NP-lt-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-lt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-lt-2.O $srcdir/NP-lt-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-lt-2"; fi;;
+    1) $echo "Test NP-lt-2 failed: files NP-lt-2.O and $srcdir/NP-lt-2.X differ" 1>&2
+       (diff -c NP-lt-2.O $srcdir/NP-lt-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-lt-2 may have failed." 1>&2
+       $echo The command "cmp NP-lt-2.O $srcdir/NP-lt-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-lt-2.E || rm -f NP-lt-2.E
+$xx ! ! '(' 5 -lt 4 ')'  > NNP-lt-2.O 2> NNP-lt-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-lt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-lt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-lt-2.O $srcdir/NN-lt-2.X > /dev/null 2>&1
+  cmp NNP-lt-2.O $srcdir/NNP-lt-2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-lt-2"; fi;;
-    1) $echo "Test NN-lt-2 failed: files NN-lt-2.O and $srcdir/NN-lt-2.X differ" 1>&2
-       (diff -c NN-lt-2.O $srcdir/NN-lt-2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-lt-2"; fi;;
+    1) $echo "Test NNP-lt-2 failed: files NNP-lt-2.O and $srcdir/NNP-lt-2.X differ" 1>&2
+       (diff -c NNP-lt-2.O $srcdir/NNP-lt-2.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-lt-2 may have failed." 1>&2
-       $echo The command "cmp NN-lt-2.O $srcdir/NN-lt-2.X" failed. 1>&2
+    2) $echo "Test NNP-lt-2 may have failed." 1>&2
+       $echo The command "cmp NNP-lt-2.O $srcdir/NNP-lt-2.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-lt-2.E || rm -f NN-lt-2.E
-$xx ! '(' 4 -lt 5 ')'  > N-lt-3.O 2> N-lt-3.E
+test -s NNP-lt-2.E || rm -f NNP-lt-2.E
+$xx ! 4 -lt 5  > N-lt-3.O 2> N-lt-3.E
 code=$?
 if test $code != 1; then
   $echo "Test N-lt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -1206,25 +3114,61 @@ else
   esac
 fi
 test -s N-lt-3.E || rm -f N-lt-3.E
-$xx ! ! '(' 4 -lt 5 ')'  > NN-lt-3.O 2> NN-lt-3.E
+$xx '(' 4 -lt 5 ')'  > P-lt-3.O 2> P-lt-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NN-lt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-lt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-lt-3.O $srcdir/NN-lt-3.X > /dev/null 2>&1
+  cmp P-lt-3.O $srcdir/P-lt-3.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-lt-3"; fi;;
-    1) $echo "Test NN-lt-3 failed: files NN-lt-3.O and $srcdir/NN-lt-3.X differ" 1>&2
-       (diff -c NN-lt-3.O $srcdir/NN-lt-3.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-lt-3"; fi;;
+    1) $echo "Test P-lt-3 failed: files P-lt-3.O and $srcdir/P-lt-3.X differ" 1>&2
+       (diff -c P-lt-3.O $srcdir/P-lt-3.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-lt-3 may have failed." 1>&2
-       $echo The command "cmp NN-lt-3.O $srcdir/NN-lt-3.X" failed. 1>&2
+    2) $echo "Test P-lt-3 may have failed." 1>&2
+       $echo The command "cmp P-lt-3.O $srcdir/P-lt-3.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-lt-3.E || rm -f NN-lt-3.E
-$xx ! '(' -1 -lt -2 ')'  > N-lt-4.O 2> N-lt-4.E
+test -s P-lt-3.E || rm -f P-lt-3.E
+$xx ! '(' 4 -lt 5 ')'  > NP-lt-3.O 2> NP-lt-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test NP-lt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-lt-3.O $srcdir/NP-lt-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-lt-3"; fi;;
+    1) $echo "Test NP-lt-3 failed: files NP-lt-3.O and $srcdir/NP-lt-3.X differ" 1>&2
+       (diff -c NP-lt-3.O $srcdir/NP-lt-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-lt-3 may have failed." 1>&2
+       $echo The command "cmp NP-lt-3.O $srcdir/NP-lt-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-lt-3.E || rm -f NP-lt-3.E
+$xx ! ! '(' 4 -lt 5 ')'  > NNP-lt-3.O 2> NNP-lt-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-lt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-lt-3.O $srcdir/NNP-lt-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-lt-3"; fi;;
+    1) $echo "Test NNP-lt-3 failed: files NNP-lt-3.O and $srcdir/NNP-lt-3.X differ" 1>&2
+       (diff -c NNP-lt-3.O $srcdir/NNP-lt-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-lt-3 may have failed." 1>&2
+       $echo The command "cmp NNP-lt-3.O $srcdir/NNP-lt-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-lt-3.E || rm -f NNP-lt-3.E
+$xx ! -1 -lt -2  > N-lt-4.O 2> N-lt-4.E
 code=$?
 if test $code != 0; then
   $echo "Test N-lt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -1242,25 +3186,133 @@ else
   esac
 fi
 test -s N-lt-4.E || rm -f N-lt-4.E
-$xx ! ! '(' -1 -lt -2 ')'  > NN-lt-4.O 2> NN-lt-4.E
+$xx '(' -1 -lt -2 ')'  > P-lt-4.O 2> P-lt-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test P-lt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-lt-4.O $srcdir/P-lt-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-lt-4"; fi;;
+    1) $echo "Test P-lt-4 failed: files P-lt-4.O and $srcdir/P-lt-4.X differ" 1>&2
+       (diff -c P-lt-4.O $srcdir/P-lt-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-lt-4 may have failed." 1>&2
+       $echo The command "cmp P-lt-4.O $srcdir/P-lt-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-lt-4.E || rm -f P-lt-4.E
+$xx ! '(' -1 -lt -2 ')'  > NP-lt-4.O 2> NP-lt-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-lt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-lt-4.O $srcdir/NP-lt-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-lt-4"; fi;;
+    1) $echo "Test NP-lt-4 failed: files NP-lt-4.O and $srcdir/NP-lt-4.X differ" 1>&2
+       (diff -c NP-lt-4.O $srcdir/NP-lt-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-lt-4 may have failed." 1>&2
+       $echo The command "cmp NP-lt-4.O $srcdir/NP-lt-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-lt-4.E || rm -f NP-lt-4.E
+$xx ! ! '(' -1 -lt -2 ')'  > NNP-lt-4.O 2> NNP-lt-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-lt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-lt-4.O $srcdir/NNP-lt-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-lt-4"; fi;;
+    1) $echo "Test NNP-lt-4 failed: files NNP-lt-4.O and $srcdir/NNP-lt-4.X differ" 1>&2
+       (diff -c NNP-lt-4.O $srcdir/NNP-lt-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-lt-4 may have failed." 1>&2
+       $echo The command "cmp NNP-lt-4.O $srcdir/NNP-lt-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-lt-4.E || rm -f NNP-lt-4.E
+$xx ! -t  > N-t1.O 2> N-t1.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-t1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-t1.O $srcdir/N-t1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-t1"; fi;;
+    1) $echo "Test N-t1 failed: files N-t1.O and $srcdir/N-t1.X differ" 1>&2
+       (diff -c N-t1.O $srcdir/N-t1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-t1 may have failed." 1>&2
+       $echo The command "cmp N-t1.O $srcdir/N-t1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-t1.E || rm -f N-t1.E
+$xx '(' -t ')'  > P-t1.O 2> P-t1.E
+code=$?
+if test $code != 0; then
+  $echo "Test P-t1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp P-t1.O $srcdir/P-t1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed P-t1"; fi;;
+    1) $echo "Test P-t1 failed: files P-t1.O and $srcdir/P-t1.X differ" 1>&2
+       (diff -c P-t1.O $srcdir/P-t1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test P-t1 may have failed." 1>&2
+       $echo The command "cmp P-t1.O $srcdir/P-t1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s P-t1.E || rm -f P-t1.E
+$xx ! '(' -t ')'  > NP-t1.O 2> NP-t1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-lt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-t1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-t1.O $srcdir/NP-t1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-t1"; fi;;
+    1) $echo "Test NP-t1 failed: files NP-t1.O and $srcdir/NP-t1.X differ" 1>&2
+       (diff -c NP-t1.O $srcdir/NP-t1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-t1 may have failed." 1>&2
+       $echo The command "cmp NP-t1.O $srcdir/NP-t1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-t1.E || rm -f NP-t1.E
+$xx ! ! '(' -t ')'  > NNP-t1.O 2> NNP-t1.E
+code=$?
+if test $code != 0; then
+  $echo "Test NNP-t1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-lt-4.O $srcdir/NN-lt-4.X > /dev/null 2>&1
+  cmp NNP-t1.O $srcdir/NNP-t1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-lt-4"; fi;;
-    1) $echo "Test NN-lt-4 failed: files NN-lt-4.O and $srcdir/NN-lt-4.X differ" 1>&2
-       (diff -c NN-lt-4.O $srcdir/NN-lt-4.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed NNP-t1"; fi;;
+    1) $echo "Test NNP-t1 failed: files NNP-t1.O and $srcdir/NNP-t1.X differ" 1>&2
+       (diff -c NNP-t1.O $srcdir/NNP-t1.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-lt-4 may have failed." 1>&2
-       $echo The command "cmp NN-lt-4.O $srcdir/NN-lt-4.X" failed. 1>&2
+    2) $echo "Test NNP-t1 may have failed." 1>&2
+       $echo The command "cmp NNP-t1.O $srcdir/NNP-t1.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-lt-4.E || rm -f NN-lt-4.E
-$xx ! '(' -t 1 ')'  > N-t2.O 2> N-t2.E
+test -s NNP-t1.E || rm -f NNP-t1.E
+$xx ! -t 1  > N-t2.O 2> N-t2.E
 code=$?
 if test $code != 0; then
   $echo "Test N-t2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -1278,24 +3330,150 @@ else
   esac
 fi
 test -s N-t2.E || rm -f N-t2.E
-$xx ! ! '(' -t 1 ')'  > NN-t2.O 2> NN-t2.E
+$xx '(' -t 1 ')'  > P-t2.O 2> P-t2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NN-t2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-t2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp NN-t2.O $srcdir/NN-t2.X > /dev/null 2>&1
+  cmp P-t2.O $srcdir/P-t2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE"; then $echo "passed NN-t2"; fi;;
-    1) $echo "Test NN-t2 failed: files NN-t2.O and $srcdir/NN-t2.X differ" 1>&2
-       (diff -c NN-t2.O $srcdir/NN-t2.X) 2> /dev/null
+    0) if test "$VERBOSE"; then $echo "passed P-t2"; fi;;
+    1) $echo "Test P-t2 failed: files P-t2.O and $srcdir/P-t2.X differ" 1>&2
+       (diff -c P-t2.O $srcdir/P-t2.X) 2> /dev/null
        errors=`expr $errors + 1`;;
-    2) $echo "Test NN-t2 may have failed." 1>&2
-       $echo The command "cmp NN-t2.O $srcdir/NN-t2.X" failed. 1>&2
+    2) $echo "Test P-t2 may have failed." 1>&2
+       $echo The command "cmp P-t2.O $srcdir/P-t2.X" failed. 1>&2
        errors=`expr $errors + 1`;;
   esac
 fi
-test -s NN-t2.E || rm -f NN-t2.E
+test -s P-t2.E || rm -f P-t2.E
+$xx ! '(' -t 1 ')'  > NP-t2.O 2> NP-t2.E
+code=$?
+if test $code != 0; then
+  $echo "Test NP-t2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NP-t2.O $srcdir/NP-t2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NP-t2"; fi;;
+    1) $echo "Test NP-t2 failed: files NP-t2.O and $srcdir/NP-t2.X differ" 1>&2
+       (diff -c NP-t2.O $srcdir/NP-t2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NP-t2 may have failed." 1>&2
+       $echo The command "cmp NP-t2.O $srcdir/NP-t2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NP-t2.E || rm -f NP-t2.E
+$xx ! ! '(' -t 1 ')'  > NNP-t2.O 2> NNP-t2.E
+code=$?
+if test $code != 1; then
+  $echo "Test NNP-t2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp NNP-t2.O $srcdir/NNP-t2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed NNP-t2"; fi;;
+    1) $echo "Test NNP-t2 failed: files NNP-t2.O and $srcdir/NNP-t2.X differ" 1>&2
+       (diff -c NNP-t2.O $srcdir/NNP-t2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test NNP-t2 may have failed." 1>&2
+       $echo The command "cmp NNP-t2.O $srcdir/NNP-t2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s NNP-t2.E || rm -f NNP-t2.E
+$xx ! '(' '' ')'  > N-paren-1.O 2> N-paren-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test N-paren-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-paren-1.O $srcdir/N-paren-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-paren-1"; fi;;
+    1) $echo "Test N-paren-1 failed: files N-paren-1.O and $srcdir/N-paren-1.X differ" 1>&2
+       (diff -c N-paren-1.O $srcdir/N-paren-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-paren-1 may have failed." 1>&2
+       $echo The command "cmp N-paren-1.O $srcdir/N-paren-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-paren-1.E || rm -f N-paren-1.E
+$xx ! '(' '(' ')'  > N-paren-2.O 2> N-paren-2.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-paren-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-paren-2.O $srcdir/N-paren-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-paren-2"; fi;;
+    1) $echo "Test N-paren-2 failed: files N-paren-2.O and $srcdir/N-paren-2.X differ" 1>&2
+       (diff -c N-paren-2.O $srcdir/N-paren-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-paren-2 may have failed." 1>&2
+       $echo The command "cmp N-paren-2.O $srcdir/N-paren-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-paren-2.E || rm -f N-paren-2.E
+$xx ! '(' ')' ')'  > N-paren-3.O 2> N-paren-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-paren-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-paren-3.O $srcdir/N-paren-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-paren-3"; fi;;
+    1) $echo "Test N-paren-3 failed: files N-paren-3.O and $srcdir/N-paren-3.X differ" 1>&2
+       (diff -c N-paren-3.O $srcdir/N-paren-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-paren-3 may have failed." 1>&2
+       $echo The command "cmp N-paren-3.O $srcdir/N-paren-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-paren-3.E || rm -f N-paren-3.E
+$xx ! '(' ! ')'  > N-paren-4.O 2> N-paren-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-paren-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-paren-4.O $srcdir/N-paren-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-paren-4"; fi;;
+    1) $echo "Test N-paren-4 failed: files N-paren-4.O and $srcdir/N-paren-4.X differ" 1>&2
+       (diff -c N-paren-4.O $srcdir/N-paren-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-paren-4 may have failed." 1>&2
+       $echo The command "cmp N-paren-4.O $srcdir/N-paren-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-paren-4.E || rm -f N-paren-4.E
+$xx ! '(' -a ')'  > N-paren-5.O 2> N-paren-5.E
+code=$?
+if test $code != 1; then
+  $echo "Test N-paren-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp N-paren-5.O $srcdir/N-paren-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed N-paren-5"; fi;;
+    1) $echo "Test N-paren-5 failed: files N-paren-5.O and $srcdir/N-paren-5.X differ" 1>&2
+       (diff -c N-paren-5.O $srcdir/N-paren-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test N-paren-5 may have failed." 1>&2
+       $echo The command "cmp N-paren-5.O $srcdir/N-paren-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s N-paren-5.E || rm -f N-paren-5.E
 $xx   > 1a.O 2> 1a.E
 code=$?
 if test $code != 1; then
@@ -1368,6 +3546,132 @@ else
   esac
 fi
 test -s 1d.E || rm -f 1d.E
+$xx ''  > 1e.O 2> 1e.E
+code=$?
+if test $code != 1; then
+  $echo "Test 1e failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1e.O $srcdir/1e.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed 1e"; fi;;
+    1) $echo "Test 1e failed: files 1e.O and $srcdir/1e.X differ" 1>&2
+       (diff -c 1e.O $srcdir/1e.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test 1e may have failed." 1>&2
+       $echo The command "cmp 1e.O $srcdir/1e.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s 1e.E || rm -f 1e.E
+$xx -  > 1f.O 2> 1f.E
+code=$?
+if test $code != 0; then
+  $echo "Test 1f failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1f.O $srcdir/1f.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed 1f"; fi;;
+    1) $echo "Test 1f failed: files 1f.O and $srcdir/1f.X differ" 1>&2
+       (diff -c 1f.O $srcdir/1f.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test 1f may have failed." 1>&2
+       $echo The command "cmp 1f.O $srcdir/1f.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s 1f.E || rm -f 1f.E
+$xx --  > 1g.O 2> 1g.E
+code=$?
+if test $code != 0; then
+  $echo "Test 1g failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1g.O $srcdir/1g.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed 1g"; fi;;
+    1) $echo "Test 1g failed: files 1g.O and $srcdir/1g.X differ" 1>&2
+       (diff -c 1g.O $srcdir/1g.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test 1g may have failed." 1>&2
+       $echo The command "cmp 1g.O $srcdir/1g.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s 1g.E || rm -f 1g.E
+$xx -0  > 1h.O 2> 1h.E
+code=$?
+if test $code != 0; then
+  $echo "Test 1h failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1h.O $srcdir/1h.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed 1h"; fi;;
+    1) $echo "Test 1h failed: files 1h.O and $srcdir/1h.X differ" 1>&2
+       (diff -c 1h.O $srcdir/1h.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test 1h may have failed." 1>&2
+       $echo The command "cmp 1h.O $srcdir/1h.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s 1h.E || rm -f 1h.E
+$xx -f  > 1i.O 2> 1i.E
+code=$?
+if test $code != 0; then
+  $echo "Test 1i failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1i.O $srcdir/1i.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed 1i"; fi;;
+    1) $echo "Test 1i failed: files 1i.O and $srcdir/1i.X differ" 1>&2
+       (diff -c 1i.O $srcdir/1i.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test 1i may have failed." 1>&2
+       $echo The command "cmp 1i.O $srcdir/1i.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s 1i.E || rm -f 1i.E
+$xx --help  > 1j.O 2> 1j.E
+code=$?
+if test $code != 0; then
+  $echo "Test 1j failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1j.O $srcdir/1j.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed 1j"; fi;;
+    1) $echo "Test 1j failed: files 1j.O and $srcdir/1j.X differ" 1>&2
+       (diff -c 1j.O $srcdir/1j.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test 1j may have failed." 1>&2
+       $echo The command "cmp 1j.O $srcdir/1j.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s 1j.E || rm -f 1j.E
+$xx --version  > 1k.O 2> 1k.E
+code=$?
+if test $code != 0; then
+  $echo "Test 1k failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1k.O $srcdir/1k.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed 1k"; fi;;
+    1) $echo "Test 1k failed: files 1k.O and $srcdir/1k.X differ" 1>&2
+       (diff -c 1k.O $srcdir/1k.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test 1k may have failed." 1>&2
+       $echo The command "cmp 1k.O $srcdir/1k.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s 1k.E || rm -f 1k.E
 $xx t = t  > streq-1.O 2> streq-1.E
 code=$?
 if test $code != 0; then
@@ -1404,6 +3708,78 @@ else
   esac
 fi
 test -s streq-2.E || rm -f streq-2.E
+$xx ! = !  > streq-3.O 2> streq-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test streq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp streq-3.O $srcdir/streq-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed streq-3"; fi;;
+    1) $echo "Test streq-3 failed: files streq-3.O and $srcdir/streq-3.X differ" 1>&2
+       (diff -c streq-3.O $srcdir/streq-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test streq-3 may have failed." 1>&2
+       $echo The command "cmp streq-3.O $srcdir/streq-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s streq-3.E || rm -f streq-3.E
+$xx = = =  > streq-4.O 2> streq-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test streq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp streq-4.O $srcdir/streq-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed streq-4"; fi;;
+    1) $echo "Test streq-4 failed: files streq-4.O and $srcdir/streq-4.X differ" 1>&2
+       (diff -c streq-4.O $srcdir/streq-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test streq-4 may have failed." 1>&2
+       $echo The command "cmp streq-4.O $srcdir/streq-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s streq-4.E || rm -f streq-4.E
+$xx '(' = '('  > streq-5.O 2> streq-5.E
+code=$?
+if test $code != 0; then
+  $echo "Test streq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp streq-5.O $srcdir/streq-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed streq-5"; fi;;
+    1) $echo "Test streq-5 failed: files streq-5.O and $srcdir/streq-5.X differ" 1>&2
+       (diff -c streq-5.O $srcdir/streq-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test streq-5 may have failed." 1>&2
+       $echo The command "cmp streq-5.O $srcdir/streq-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s streq-5.E || rm -f streq-5.E
+$xx '(' = ')'  > streq-6.O 2> streq-6.E
+code=$?
+if test $code != 1; then
+  $echo "Test streq-6 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp streq-6.O $srcdir/streq-6.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed streq-6"; fi;;
+    1) $echo "Test streq-6 failed: files streq-6.O and $srcdir/streq-6.X differ" 1>&2
+       (diff -c streq-6.O $srcdir/streq-6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test streq-6 may have failed." 1>&2
+       $echo The command "cmp streq-6.O $srcdir/streq-6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s streq-6.E || rm -f streq-6.E
 $xx t != t  > strne-1.O 2> strne-1.E
 code=$?
 if test $code != 1; then
@@ -1440,6 +3816,78 @@ else
   esac
 fi
 test -s strne-2.E || rm -f strne-2.E
+$xx ! != !  > strne-3.O 2> strne-3.E
+code=$?
+if test $code != 1; then
+  $echo "Test strne-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp strne-3.O $srcdir/strne-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed strne-3"; fi;;
+    1) $echo "Test strne-3 failed: files strne-3.O and $srcdir/strne-3.X differ" 1>&2
+       (diff -c strne-3.O $srcdir/strne-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test strne-3 may have failed." 1>&2
+       $echo The command "cmp strne-3.O $srcdir/strne-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s strne-3.E || rm -f strne-3.E
+$xx = != =  > strne-4.O 2> strne-4.E
+code=$?
+if test $code != 1; then
+  $echo "Test strne-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp strne-4.O $srcdir/strne-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed strne-4"; fi;;
+    1) $echo "Test strne-4 failed: files strne-4.O and $srcdir/strne-4.X differ" 1>&2
+       (diff -c strne-4.O $srcdir/strne-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test strne-4 may have failed." 1>&2
+       $echo The command "cmp strne-4.O $srcdir/strne-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s strne-4.E || rm -f strne-4.E
+$xx '(' != '('  > strne-5.O 2> strne-5.E
+code=$?
+if test $code != 1; then
+  $echo "Test strne-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp strne-5.O $srcdir/strne-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed strne-5"; fi;;
+    1) $echo "Test strne-5 failed: files strne-5.O and $srcdir/strne-5.X differ" 1>&2
+       (diff -c strne-5.O $srcdir/strne-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test strne-5 may have failed." 1>&2
+       $echo The command "cmp strne-5.O $srcdir/strne-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s strne-5.E || rm -f strne-5.E
+$xx '(' != ')'  > strne-6.O 2> strne-6.E
+code=$?
+if test $code != 0; then
+  $echo "Test strne-6 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp strne-6.O $srcdir/strne-6.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed strne-6"; fi;;
+    1) $echo "Test strne-6 failed: files strne-6.O and $srcdir/strne-6.X differ" 1>&2
+       (diff -c strne-6.O $srcdir/strne-6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test strne-6 may have failed." 1>&2
+       $echo The command "cmp strne-6.O $srcdir/strne-6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s strne-6.E || rm -f strne-6.E
 $xx t -a t  > and-1.O 2> and-1.E
 code=$?
 if test $code != 0; then
@@ -1458,7 +3906,7 @@ else
   esac
 fi
 test -s and-1.E || rm -f and-1.E
-$xx "" -a t  > and-2.O 2> and-2.E
+$xx '' -a t  > and-2.O 2> and-2.E
 code=$?
 if test $code != 1; then
   $echo "Test and-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -1476,7 +3924,7 @@ else
   esac
 fi
 test -s and-2.E || rm -f and-2.E
-$xx t -a ""  > and-3.O 2> and-3.E
+$xx t -a ''  > and-3.O 2> and-3.E
 code=$?
 if test $code != 1; then
   $echo "Test and-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -1494,7 +3942,7 @@ else
   esac
 fi
 test -s and-3.E || rm -f and-3.E
-$xx "" -a ""  > and-4.O 2> and-4.E
+$xx '' -a ''  > and-4.O 2> and-4.E
 code=$?
 if test $code != 1; then
   $echo "Test and-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -1530,7 +3978,7 @@ else
   esac
 fi
 test -s or-1.E || rm -f or-1.E
-$xx "" -o t  > or-2.O 2> or-2.E
+$xx '' -o t  > or-2.O 2> or-2.E
 code=$?
 if test $code != 0; then
   $echo "Test or-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -1548,7 +3996,7 @@ else
   esac
 fi
 test -s or-2.E || rm -f or-2.E
-$xx t -o ""  > or-3.O 2> or-3.E
+$xx t -o ''  > or-3.O 2> or-3.E
 code=$?
 if test $code != 0; then
   $echo "Test or-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
@@ -1566,7 +4014,7 @@ else
   esac
 fi
 test -s or-3.E || rm -f or-3.E
-$xx "" -o ""  > or-4.O 2> or-4.E
+$xx '' -o ''  > or-4.O 2> or-4.E
 code=$?
 if test $code != 1; then
   $echo "Test or-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
@@ -1820,8 +4268,8 @@ fi
 test -s lt-4.E || rm -f lt-4.E
 $xx 0x0 -eq 00  > inv-1.O 2> inv-1.E
 code=$?
-if test $code != 1; then
-  $echo "Test inv-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+if test $code != 2; then
+  $echo "Test inv-1 failed: ../../src/test return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp inv-1.O $srcdir/inv-1.X > /dev/null 2>&1
@@ -1838,8 +4286,8 @@ fi
 test -s inv-1.E || rm -f inv-1.E
 $xx -t  > t1.O 2> t1.E
 code=$?
-if test $code != 1; then
-  $echo "Test t1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+if test $code != 0; then
+  $echo "Test t1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1.O $srcdir/t1.X > /dev/null 2>&1
@@ -1872,8 +4320,98 @@ else
   esac
 fi
 test -s t2.E || rm -f t2.E
+$xx '(' '' ')'  > paren-1.O 2> paren-1.E
+code=$?
+if test $code != 1; then
+  $echo "Test paren-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp paren-1.O $srcdir/paren-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed paren-1"; fi;;
+    1) $echo "Test paren-1 failed: files paren-1.O and $srcdir/paren-1.X differ" 1>&2
+       (diff -c paren-1.O $srcdir/paren-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test paren-1 may have failed." 1>&2
+       $echo The command "cmp paren-1.O $srcdir/paren-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s paren-1.E || rm -f paren-1.E
+$xx '(' '(' ')'  > paren-2.O 2> paren-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test paren-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp paren-2.O $srcdir/paren-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed paren-2"; fi;;
+    1) $echo "Test paren-2 failed: files paren-2.O and $srcdir/paren-2.X differ" 1>&2
+       (diff -c paren-2.O $srcdir/paren-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test paren-2 may have failed." 1>&2
+       $echo The command "cmp paren-2.O $srcdir/paren-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s paren-2.E || rm -f paren-2.E
+$xx '(' ')' ')'  > paren-3.O 2> paren-3.E
+code=$?
+if test $code != 0; then
+  $echo "Test paren-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp paren-3.O $srcdir/paren-3.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed paren-3"; fi;;
+    1) $echo "Test paren-3 failed: files paren-3.O and $srcdir/paren-3.X differ" 1>&2
+       (diff -c paren-3.O $srcdir/paren-3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test paren-3 may have failed." 1>&2
+       $echo The command "cmp paren-3.O $srcdir/paren-3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s paren-3.E || rm -f paren-3.E
+$xx '(' ! ')'  > paren-4.O 2> paren-4.E
+code=$?
+if test $code != 0; then
+  $echo "Test paren-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp paren-4.O $srcdir/paren-4.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed paren-4"; fi;;
+    1) $echo "Test paren-4 failed: files paren-4.O and $srcdir/paren-4.X differ" 1>&2
+       (diff -c paren-4.O $srcdir/paren-4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test paren-4 may have failed." 1>&2
+       $echo The command "cmp paren-4.O $srcdir/paren-4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s paren-4.E || rm -f paren-4.E
+$xx '(' -a ')'  > paren-5.O 2> paren-5.E
+code=$?
+if test $code != 0; then
+  $echo "Test paren-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp paren-5.O $srcdir/paren-5.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed paren-5"; fi;;
+    1) $echo "Test paren-5 failed: files paren-5.O and $srcdir/paren-5.X differ" 1>&2
+       (diff -c paren-5.O $srcdir/paren-5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test paren-5 may have failed." 1>&2
+       $echo The command "cmp paren-5.O $srcdir/paren-5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s paren-5.E || rm -f paren-5.E
 if test $errors = 0; then
-  $echo Passed all 103 tests. 1>&2
+  $echo Passed all 244 tests. 1>&2
 else
   $echo Failed $errors tests. 1>&2
 fi