diff --git a/test/compiler/expressions/compiler_helper.rb b/test/compiler/expressions/helper.rb
similarity index 97%
rename from test/compiler/expressions/compiler_helper.rb
rename to test/compiler/expressions/helper.rb
index 71cf073d..3e2ae662 100644
--- a/test/compiler/expressions/compiler_helper.rb
+++ b/test/compiler/expressions/helper.rb
@@ -9,7 +9,7 @@ Soml::Compiler.class_eval do
   end
 end
 
-module CompilerHelper
+module ExpressionHelper
 
   def set_main compiler
     compiler.set_main Register.machine.space.get_main
diff --git a/test/compiler/expressions/test_all.rb b/test/compiler/expressions/test_all.rb
index 84ede13b..4c395491 100644
--- a/test/compiler/expressions/test_all.rb
+++ b/test/compiler/expressions/test_all.rb
@@ -1,3 +1,4 @@
 require_relative "test_basic"
 require_relative "test_call"
 require_relative "test_field_access"
+require_relative "test_ops"
diff --git a/test/compiler/expressions/test_basic.rb b/test/compiler/expressions/test_basic.rb
index 8c416b26..c0d3e0fb 100644
--- a/test/compiler/expressions/test_basic.rb
+++ b/test/compiler/expressions/test_basic.rb
@@ -1,8 +1,8 @@
-require_relative "compiler_helper"
+require_relative "helper"
 
 
 class TestBasic < MiniTest::Test
-  include CompilerHelper
+  include ExpressionHelper
 
   def setup
     @root = :basic_type
@@ -11,7 +11,7 @@ class TestBasic < MiniTest::Test
 
   def test_number
     @string_input    = '42 '
-    assert_equal 42 , check.value 
+    assert_equal 42 , check.value
   end
 
   def test_true
@@ -39,6 +39,11 @@ class TestBasic < MiniTest::Test
     check
   end
 
+  def test_space
+    @string_input    = 'self '
+    check
+  end
+
   def test_string
     @string_input    = "\"hello\""
     check
diff --git a/test/compiler/expressions/test_call.rb b/test/compiler/expressions/test_call.rb
index cde6cfe7..840e40cf 100644
--- a/test/compiler/expressions/test_call.rb
+++ b/test/compiler/expressions/test_call.rb
@@ -1,8 +1,8 @@
-require_relative "compiler_helper"
+require_relative "helper"
 
 module Register
   class TestCall < MiniTest::Test
-    include CompilerHelper
+    include ExpressionHelper
 
     def setup
       Register.machine.boot
diff --git a/test/compiler/expressions/test_field_access.rb b/test/compiler/expressions/test_field_access.rb
index 3f7e9199..87627b0d 100644
--- a/test/compiler/expressions/test_field_access.rb
+++ b/test/compiler/expressions/test_field_access.rb
@@ -1,8 +1,8 @@
-require_relative "compiler_helper"
+require_relative "helper"
 
 module Register
   class TestFields < MiniTest::Test
-    include CompilerHelper
+    include ExpressionHelper
 
     def setup
       Register.machine.boot
@@ -16,6 +16,14 @@ HERE
       assert_raises(RuntimeError) { check }
     end
 
+    def test_field_not_space
+      @root = :field_access
+      @string_input = <<HERE
+self.space
+HERE
+      assert_raises(RuntimeError) { check }
+    end
+
     def test_field
       Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro,:Object)
       @root = :field_access
@@ -34,6 +42,13 @@ HERE
       check
     end
 
+    def test_space
+      @root = :name
+      @string_input    = 'space '
+      @output = Register::RegisterValue
+      check
+    end
+
     def test_args
       Register.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
       @root = :name
diff --git a/test/compiler/expressions/test_ops.rb b/test/compiler/expressions/test_ops.rb
index 064ccb5c..351cb368 100644
--- a/test/compiler/expressions/test_ops.rb
+++ b/test/compiler/expressions/test_ops.rb
@@ -1,8 +1,8 @@
-require_relative "compiler_helper"
+require_relative "helper"
 
 module Register
   class TestOps < MiniTest::Test
-    include CompilerHelper
+    include ExpressionHelper
 
     def setup
       Register.machine.boot
@@ -31,13 +31,13 @@ module Register
     end
 
     def test_field_int
-      Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
+      Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro,:int)
       @string_input = "self.bro + 3"
       check
     end
 
     def test_int_field
-      Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
+      Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro,:int)
       @string_input = "3 + self.bro"
       check
     end
diff --git a/test/compiler/statements/test_return.rb b/test/compiler/statements/test_return.rb
index 8bd96f2c..5777536a 100644
--- a/test/compiler/statements/test_return.rb
+++ b/test/compiler/statements/test_return.rb
@@ -45,7 +45,7 @@ end
 HERE
     @expect =  [Label, LoadConstant,GetSlot,SetSlot,GetSlot,GetSlot ,SetSlot,
                 Label,RegisterTransfer,GetSlot,FunctionReturn]
-  check
+    check
   end
 
   def test_return_field
@@ -56,6 +56,20 @@ class Object
     return self.runner
   end
 end
+HERE
+    @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
+    check
+  end
+
+  def pest_return_space_length # need to add runtime first
+    @string_input = <<HERE
+class Object
+
+  int main()
+    Layout l = space.get_layout()
+    return self.runner
+  end
+end
 HERE
   @expect =  [Label, GetSlot,GetSlot ,SetSlot,Label,RegisterTransfer,GetSlot,FunctionReturn]
   check