diff --git a/src/robotwar/core.clj b/src/robotwar/core.clj
index dba5cb0..0ccd85a 100644
--- a/src/robotwar/core.clj
+++ b/src/robotwar/core.clj
@@ -1,6 +1,6 @@
 (ns robotwar.core
   (:use [clojure.pprint :only [pprint]])
-  (:require [robotwar.test-programs :as test-programs]
+  (:require [robotwar.source-programs :as source-programs]
             [robotwar.world :as world]
             [robotwar.register :as register]
             [robotwar.robot :as robot]
@@ -12,7 +12,7 @@
 
 
 (def progs 
-  (repeat 3 (:moving-to-spot test-programs/programs)))
+  (repeat 3 (:moving-to-spot source-programs/programs)))
 (def world
   (world/init-world progs)) 
 (defn combined-worlds [] 
diff --git a/src/robotwar/handler.clj b/src/robotwar/handler.clj
index a3cae52..3e5dce8 100644
--- a/src/robotwar/handler.clj
+++ b/src/robotwar/handler.clj
@@ -4,7 +4,7 @@
             [ring.middleware.json :as middleware]
             [ring.util.response :as response]
             [compojure.route :as route]
-            [robotwar.test-programs :as test-programs]
+            [robotwar.source-programs :as source-programs]
             [robotwar.world :as world]
             [robotwar.browser :as browser]))
 
@@ -23,7 +23,7 @@
 ; in the browser, not hard-coded here.
 
 (def progs 
-  (repeat 3 (:moving-to-spot test-programs/programs)))
+  (repeat 3 (:moving-to-spot source-programs/programs)))
 (def world
   (world/init-world progs)) 
 (defn combined-worlds [] 
@@ -32,7 +32,7 @@
 (def worlds (agent (browser/worlds-for-browser (combined-worlds))))
 
 (defroutes app-routes
-  (GET "/programs" [] (response/response test-programs/programs))
+  (GET "/programs" [] (response/response source-programs/programs))
   (GET "/worlds/:n" [n] (response/response 
                               (take-drop-send worlds (Integer/parseInt n))))
   (route/files "/")
diff --git a/test/robotwar/test_programs.clj b/src/robotwar/source_programs.clj
similarity index 98%
rename from test/robotwar/test_programs.clj
rename to src/robotwar/source_programs.clj
index c575685..553acec 100644
--- a/test/robotwar/test_programs.clj
+++ b/src/robotwar/source_programs.clj
@@ -1,4 +1,4 @@
-(ns robotwar.test-programs)
+(ns robotwar.source-programs)
 
 (def programs
   {:multi-use
diff --git a/test/robotwar/brain_test.clj b/test/robotwar/brain_test.clj
index 267152a..6c35b2b 100644
--- a/test/robotwar/brain_test.clj
+++ b/test/robotwar/brain_test.clj
@@ -4,10 +4,10 @@
         [robotwar.brain])
   (:require [robotwar.world :as world]
             [robotwar.register :as register]
-            [robotwar.test-programs :as test-programs]))
+            [robotwar.source-programs :as source-programs]))
 
 (def initial-world 
-  (world/init-world 256.0 256.0 [(:multi-use test-programs/programs)]))
+  (world/init-world [(:multi-use source-programs/programs)]))
 
 (def combined-worlds (world/build-combined-worlds initial-world))
 
diff --git a/test/robotwar/register_test.clj b/test/robotwar/register_test.clj
index 211e309..124191d 100644
--- a/test/robotwar/register_test.clj
+++ b/test/robotwar/register_test.clj
@@ -4,7 +4,7 @@
         [robotwar.register])
   (:require [robotwar.world :as world]))
 
-(def world (world/init-world 256.0 256.0 [""]))
+(def world (world/init-world [""]))
 (def robot-path [:robots 0])
 (def reg-path [:robots 0 :brain :registers])
 (def registers (get-in world reg-path))
diff --git a/test/robotwar/robot_test.clj b/test/robotwar/robot_test.clj
index 3c1a29b..1191012 100644
--- a/test/robotwar/robot_test.clj
+++ b/test/robotwar/robot_test.clj
@@ -6,7 +6,7 @@
   (:require [robotwar.register :as register]
             [robotwar.world :as world]))
 
-(def world (world/init-world 256.0 256.0 [""]))
+(def world (world/init-world [""]))
 
 ; The next four tests are pretty much cut and pasted from each other. So sue me.
 ; To change them significantly, delete three of them and build up from the first one