patch 8.0.0861: still many old style tests

Problem:    Still many old style tests.
Solution:   Convert several tests to new style. (Yegappan Lakshmanan)
diff --git a/src/testdir/main.aap b/src/testdir/main.aap
index 93159ba..4fb6ca6 100644
--- a/src/testdir/main.aap
+++ b/src/testdir/main.aap
@@ -5,9 +5,9 @@
 VimProg ?= ../vim
 
 Scripts = test1.out test2.out test3.out test4.out test5.out test6.out
-		test7.out test8.out test9.out test11.out
+		test7.out test8.out test11.out
 		test12.out  test13.out test14.out test15.out test17.out
-		test18.out test19.out test20.out test21.out test22.out
+		test18.out test19.out test20.out test21.out
 		test25.out test27.out
 		test28.out test29.out test30.out test31.out test32.out
 		test33.out test34.out test36.out test37.out