Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -50,12 +50,19 @@
 	cd fullrun;megatest -runtests runfirst/%,%/ai -target ubuntu/nfs/none :runname $(RUNNAME)_02 -debug $(DEBUG)
 	cd fullrun;megatest -runtests %/,%/winter -target ubuntu/nfs/none :runname $(RUNNAME)_03  -debug $(DEBUG)
 	sleep 40;cd fullrun;megatest -target ubuntu/nfs/none :runname $(RUNNAME) -set-state-status COMPLETED,FORCED :state COMPLETED :status PASS -testpatt ez_p%s,runfirst/ -debug $(DEBUG) $(LOGGING)
 
 
-test3 : fullprep
-	cd fullrun;$(MEGATEST) -runtests runfirst -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -debug 10
+test3 : fullprep test3a test3b
+
+test3a :
+	@echo Run runfirst and any waitons.
+	cd fullrun;$(MEGATEST) -runtests runfirst -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b 
+
+test3b :
+	@echo Run all_toplevel and all waitons
+	cd fullrun;$(MEGATEST) -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_c
 
 test4 : cleanprep
 	@echo "WARNING: No longer running fullprep, test converage may be lessened"
 	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -runtests % -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
 

Index: tests/fullrun/tests/all_toplevel/calcresults.logpro
==================================================================
--- tests/fullrun/tests/all_toplevel/calcresults.logpro
+++ tests/fullrun/tests/all_toplevel/calcresults.logpro
@@ -3,11 +3,10 @@
 ;;   License GPL.
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
-		     ("all_toplevel"            1  20)
 		     ("exit_0"		        1  20)
 		     ("ezlog_fail_then_pass"    1  20)
 		     ("ezlog_pass"	        1  20)
 		     ("ez_pass"		        1  20)
 		     ("lineitem_pass"	        1  20)
@@ -57,14 +56,15 @@
      ;;(expect:value    in logbody count < msg2 rxe)
      ))
 
 ;; Special cases
 ;;
-(expect:error    in logbody =  0  "tests left in RUNNING state"   #/State: RUNNING/)
-(expect:required in logbody =  1  "priority_2 is KILLED"          #/Test: priority_2\s+State: KILLED\s+Status: FAIL/)
-(expect:required in logbody =  1  "testxz has 1 NOT_STARTED test" #/Test: testxz\s+State: NOT_STARTED/)
-(expect:required in logbody = 29  "blocktestxz has 29 tests"      #/Test: blocktestxz/)
+(expect:ignore   in logbody >= 0  "all_toplevel may not yet be done" #/Test: all_toplevel/)
+(expect:error    in logbody =  0  "tests left in RUNNING state"      #/State: RUNNING/)
+(expect:required in logbody =  1  "priority_2 is KILLED"             #/Test: priority_2\s+State: KILLED\s+Status: FAIL/)
+(expect:required in logbody =  1  "testxz has 1 NOT_STARTED test"    #/Test: testxz\s+State: NOT_STARTED/)
+(expect:required in logbody = 29  "blocktestxz has 29 tests"         #/Test: blocktestxz/)
 
 ;; General cases
 ;;
 (for-each 
  (lambda (testdat)