diff --git a/collects/tests/mzscheme/beg-adv.ss b/collects/tests/mzscheme/beg-adv.ss
index dd4528302f..72942ea8c4 100644
--- a/collects/tests/mzscheme/beg-adv.ss
+++ b/collects/tests/mzscheme/beg-adv.ss
@@ -133,14 +133,6 @@
 (htdp-test #t 'eq? (eq? #t true))
 (htdp-test #t 'eq? (eq? #f false))
 
-(htdp-err/rt-test (+) exn:application:arity?)
-(htdp-err/rt-test (+ 1) exn:application:arity?)
-(htdp-err/rt-test (*) exn:application:arity?)
-(htdp-err/rt-test (* 1) exn:application:arity?)
-(htdp-err/rt-test (-) exn:application:arity?)
-(htdp-err/rt-test (/) exn:application:arity?)
-(htdp-err/rt-test (/ 1) exn:application:arity?)
-
 (htdp-test -9 '- (- 9))
 
 (htdp-top (define-struct an-example-structure (first-field second-field)))
diff --git a/collects/tests/mzscheme/beg-bega.ss b/collects/tests/mzscheme/beg-bega.ss
index 971bfa993d..644a2561bd 100644
--- a/collects/tests/mzscheme/beg-bega.ss
+++ b/collects/tests/mzscheme/beg-bega.ss
@@ -44,3 +44,15 @@
 
 (htdp-top-pop 1)
 (htdp-teachpack-pop)
+
+(htdp-err/rt-test (+) exn:application:arity?)
+(htdp-err/rt-test (+ 1) exn:application:arity?)
+(htdp-err/rt-test (*) exn:application:arity?)
+(htdp-err/rt-test (* 1) exn:application:arity?)
+(htdp-err/rt-test (-) exn:application:arity?)
+(htdp-err/rt-test (/) exn:application:arity?)
+(htdp-err/rt-test (/ 1) exn:application:arity?)
+
+(err/rt-test (+) exn:application:arity?)
+
+
diff --git a/collects/tests/mzscheme/beg-intm.ss b/collects/tests/mzscheme/beg-intm.ss
index a67cdaa8f7..11c7fd4b82 100644
--- a/collects/tests/mzscheme/beg-intm.ss
+++ b/collects/tests/mzscheme/beg-intm.ss
@@ -9,3 +9,4 @@
 (htdp-syntax-test #'(lambda (x) 10))
 
 (htdp-syntax-test #'(lambda (f) (f f)))
+
diff --git a/collects/tests/mzscheme/intm-adv.ss b/collects/tests/mzscheme/intm-adv.ss
index ff116a24bb..bbf6955d21 100644
--- a/collects/tests/mzscheme/intm-adv.ss
+++ b/collects/tests/mzscheme/intm-adv.ss
@@ -1,10 +1,6 @@
 
 ;; These are true for beginner, but the operators are syntax, so
 ;; arity-test doesn't work.
-(arity-test + 2 -1)
-(arity-test * 2 -1)
-(arity-test / 2 -1)
-(arity-test - 1 -1)
 
 (htdp-syntax-test #'local)
 (htdp-syntax-test #'(local))
@@ -108,3 +104,11 @@
 
 (htdp-err/rt-test (build-string 2 add1)
   "build-string : second argument must be a <procedure> that produces a <char>, given #<procedure:add1>, which produced 1 for 0")
+
+(htdp-test 0 '+ (+))
+(htdp-test 1 '+ (+ 1))
+(htdp-test 1 '* (*))
+(htdp-test 1 '* (* 1))
+;(htdp-test (-) exn:application:arity?)
+;(htdp-err/rt-test (/) exn:application:arity?)
+;(htdp-test 1 (/ 1) exn:application:arity?)
diff --git a/collects/tests/mzscheme/intmlam-adv.ss b/collects/tests/mzscheme/intmlam-adv.ss
index e8294b1a9c..3745d00903 100644
--- a/collects/tests/mzscheme/intmlam-adv.ss
+++ b/collects/tests/mzscheme/intmlam-adv.ss
@@ -11,6 +11,6 @@
 (test 'id f11 'id)
 
 (err/rt-test (1 2 3))
-(err/rt-test (+) exn:application:arity?)
+