diff --git a/test/bench/soml/helper.rb b/test/bench/soml/helper.rb
index 17763de7..2c8918ae 100644
--- a/test/bench/soml/helper.rb
+++ b/test/bench/soml/helper.rb
@@ -5,8 +5,6 @@ require_relative '../../soml/helper'
 module BenchTests
 
   include RuntimeTests
-  
-  ENV["REMOTE_PI"] = "pi" unless ENV.has_key?("REMOTE_PI")
 
   def setup
     @stdout =  ""
@@ -28,4 +26,8 @@ HERE
   def check_remote val
     check_r val , true
   end
+
+  def connected
+    make_box
+  end
 end
diff --git a/test/bench/soml/test_integer.rb b/test/bench/soml/integer.rb
similarity index 100%
rename from test/bench/soml/test_integer.rb
rename to test/bench/soml/integer.rb
diff --git a/test/bench/soml/test_word.rb b/test/bench/soml/word.rb
similarity index 100%
rename from test/bench/soml/test_word.rb
rename to test/bench/soml/word.rb
diff --git a/test/soml/helper.rb b/test/soml/helper.rb
index 233968ba..73369450 100644
--- a/test/soml/helper.rb
+++ b/test/soml/helper.rb
@@ -57,6 +57,10 @@ module RuntimeTests
     puts "remote " + ENV["REMOTE_PI"]
     user , rest = ENV["REMOTE_PI"].split("@")
     machine , port = rest.to_s.split(":")
+    make_box machine , port , user
+  end
+  
+  def make_box machine = nil , port = nil , user = nil
     @@conn = Rye::Box.new(machine || "localhost" , :port => (port || 2222) , :user => (user || "pi"))
   end