diff --git a/collects/tests/stepper/automatic-tests.ss b/collects/tests/stepper/automatic-tests.ss
index c2c6709cd6..8287fadee4 100644
--- a/collects/tests/stepper/automatic-tests.ss
+++ b/collects/tests/stepper/automatic-tests.ss
@@ -1,9 +1,11 @@
-(module automatic-tests mzscheme
-  (require "through-tests.ss" 
-           "test-engine.ss")
-  
-  (parameterize ([display-only-errors #t]
-                 [current-output-port (open-output-string)])
-    (if (run-all-tests-except '(bad-and bad-cons check-error begin-let-bug prims qq-splice time set! local-set! lazy1 lazy2 lazy3))
-        (exit 1)
-        (exit 0))))
+#lang scheme
+
+(require "through-tests.ss" 
+         "test-engine.ss")
+
+(parameterize ([display-only-errors #t]
+               [current-output-port (open-output-string)]
+               [current-namespace (make-base-namespace)])
+  (if (run-all-tests-except '(bad-and bad-cons check-error begin-let-bug prims qq-splice time set! local-set! lazy1 lazy2 lazy3))
+      (exit 1)
+      (exit 0)))
diff --git a/collects/tests/stepper/manual-tests.txt b/collects/tests/stepper/manual-tests.txt
index b72d6949d7..cde635e56c 100644
--- a/collects/tests/stepper/manual-tests.txt
+++ b/collects/tests/stepper/manual-tests.txt
@@ -17,3 +17,5 @@ Try programs which print snips (print-convert-test.ss)
 try programs that contain test cases; make sure that the popups behave sensibly.
 
 Try jumping to the end on a program with an error.
+** jumping to end when already at end doesn't behave properly ("no step
+   matching that criterion")
diff --git a/collects/tests/stepper/test-engine.ss b/collects/tests/stepper/test-engine.ss
index fee8189a79..5bdc1895b3 100644
--- a/collects/tests/stepper/test-engine.ss
+++ b/collects/tests/stepper/test-engine.ss
@@ -6,8 +6,10 @@
          lang/run-teaching-program
          (only-in srfi/13 string-contains)
          scheme/contract
-         #;(file "/Users/clements/clements/scheme-scraps/eli-debug.ss")
-         "language-level-model.ss")
+         (file "/Users/clements/clements/scheme-scraps/eli-debug.ss")
+         "language-level-model.ss"
+         ;; temp:
+         stepper/private/annotate)
 
 
 ;; A SIMPLE EXAMPLE OF USING THIS FRAMEWORK:
@@ -110,6 +112,8 @@
     ))
 
 
+
+
 ;; test-sequence/many : model-or-models/c string? steps? -> (void)
 ;; run a given test through a bunch of language models (or just one).
 
@@ -167,7 +171,6 @@
                             (show-result result error-box)
                             (car all-steps)))
                   (set! all-steps (cdr all-steps)))))]
-         [dc1 (display (expanded-thunk))]
          [iter-caller
           (lambda (init iter)
             (init)
@@ -187,7 +190,7 @@
 (define (call-iter-on-each stx-thunk iter)
   (let* ([next (stx-thunk)]
          [followup-thunk (if (eof-object? next) void (lambda () (call-iter-on-each stx-thunk iter)))])
-    (iter next followup-thunk)))
+    (iter (expand next) followup-thunk)))
 
 
 (define (warn error-box who fmt . args)
@@ -275,3 +278,6 @@
            (lambda () (expand-teaching-program p2 read-syntax namespace-spec teachpack-specs #f module-id enable-testing?))])
      (display (expanded-thunk))
      (test-sequence/core render-settings show-lambdas-as-lambdas? expanded-thunk '() (box #f)))])
+
+
+
diff --git a/collects/tests/stepper/through-tests.ss b/collects/tests/stepper/through-tests.ss
index 1a02656461..8287a11c62 100755
--- a/collects/tests/stepper/through-tests.ss
+++ b/collects/tests/stepper/through-tests.ss
@@ -13,6 +13,7 @@
 
          )
 
+
 (provide run-test run-tests run-all-tests run-all-tests-except)
 
 (define list-of-tests null)
@@ -1442,7 +1443,11 @@
                    #;[show-all-steps #t])
       #;(run-tests '(check-expect forward-ref check-within check-within-bad check-error check-error-bad))
       #;(run-tests '(teachpack-universe))
-      #;(run-tests '(check-expect check-within))
+      #;(run-tests '(simple-if))
       (run-all-tests)))
   
+  
 
+
+  
+  
\ No newline at end of file