patch 8.0.1221: still too many old style tests

Problem:    Still too many old style tests.
Solution:   Convert a few more tests to new style. (Yegappan Lakshmanan,
            closes #2256)
diff --git a/src/testdir/main.aap b/src/testdir/main.aap
index 51e60de..14afaac 100644
--- a/src/testdir/main.aap
+++ b/src/testdir/main.aap
@@ -7,11 +7,10 @@
 Scripts = test1.out test2.out test3.out test6.out
 		test11.out
 		test12.out  test13.out test14.out test15.out test17.out
-		test18.out test19.out test20.out test21.out
-		test25.out test27.out
-		test28.out test29.out test30.out test32.out
+		test18.out test21.out
+		test27.out test29.out test30.out
 		test36.out test37.out
-		test38.out test39.out test40.out test42.out
+		test39.out test40.out test42.out
 		test44.out test45.out test46.out test47.out
 		test48.out test49.out test74.out