diff --git a/test/risc/interpreter/assign/test_assign_local.rb b/test/risc/interpreter/assign/test_assign_local.rb
index b2792e28..4f7c1347 100644
--- a/test/risc/interpreter/assign/test_assign_local.rb
+++ b/test/risc/interpreter/assign/test_assign_local.rb
@@ -11,11 +11,10 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain  [LoadConstant, RegToSlot, SlotToReg, RegToSlot, Branch,
-            SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, RegToSlot, SlotToReg, SlotToReg, SlotToReg,
-            FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, # 20
-            NilClass, ]
+      check_main_chain  [LoadConstant, RegToSlot, SlotToReg, RegToSlot, Branch, #5
+                 SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg, #10
+                 SlotToReg, FunctionReturn, Transfer, SlotToReg, SlotToReg, #15
+                 Syscall, NilClass,] #20
       assert_equal 15 , get_return
     end
 
@@ -31,17 +30,17 @@ module Risc
       assert_equal 15 , @interpreter.get_register(load_ins.register).value
     end
     def test_return
-      ret = main_ticks(16)
+      ret = main_ticks(12)
       assert_equal FunctionReturn ,  ret.class
       link = @interpreter.get_register( ret.register )
       assert_equal ::Integer , link.class
     end
     def test_transfer
-      transfer = main_ticks(17)
+      transfer = main_ticks(13)
       assert_equal Transfer ,  transfer.class
     end
     def test_sys
-      sys = main_ticks(20)
+      sys = main_ticks(16)
       assert_equal Syscall ,  sys.class
     end
   end
diff --git a/test/risc/interpreter/blocks/test_assign_outer.rb b/test/risc/interpreter/blocks/test_assign_outer.rb
index 3631910f..f338bcb0 100644
--- a/test/risc/interpreter/blocks/test_assign_outer.rb
+++ b/test/risc/interpreter/blocks/test_assign_outer.rb
@@ -11,29 +11,24 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain    [LoadConstant, RegToSlot, LoadConstant, LoadConstant, SlotToReg,
-            SlotToReg, RegToSlot, RegToSlot, RegToSlot, RegToSlot, # 10
-            SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg,
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg, # 20
-            FunctionCall, LoadConstant, SlotToReg, OperatorInstruction, IsZero,
-            SlotToReg, LoadConstant, SlotToReg, SlotToReg, RegToSlot, # 30
-            RegToSlot, RegToSlot, RegToSlot, SlotToReg, SlotToReg,
-            RegToSlot, SlotToReg, LoadConstant, RegToSlot, SlotToReg, # 40
-            SlotToReg, DynamicJump, LoadConstant, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, RegToSlot, Branch, SlotToReg, # 50
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 60
-            SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, SlotToReg, Branch, RegToSlot, # 70
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, # 80
-            RegToSlot, LoadConstant, SlotToReg, Branch, RegToSlot,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 90
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain  [LoadConstant, RegToSlot, LoadConstant, RegToSlot, SlotToReg, #5
+                 SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #10
+                 LoadConstant, SlotToReg, RegToSlot, SlotToReg, FunctionCall, #15
+                 LoadConstant, SlotToReg, OperatorInstruction, IsZero, SlotToReg, #20
+                 RegToSlot, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #25
+                 LoadConstant, RegToSlot, SlotToReg, SlotToReg, DynamicJump, #30
+                 LoadConstant, SlotToReg, SlotToReg, RegToSlot, LoadConstant, #35
+                 RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #40
+                 SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, #45
+                 RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #50
+                 SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, #55
+                 RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #60
+                 SlotToReg, SlotToReg, SlotToReg, FunctionReturn, Transfer, #65
+                 SlotToReg, SlotToReg, Syscall, NilClass,] #70
       assert_equal 10 , get_return
     end
+    def base ; 30 ; end
 
-    def base ; 42 ; end
     def test_block_jump
       load_ins = main_ticks(base)
       assert_equal DynamicJump ,  load_ins.class
diff --git a/test/risc/interpreter/blocks/test_block_return.rb b/test/risc/interpreter/blocks/test_block_return.rb
index ea63e79c..e95f6481 100644
--- a/test/risc/interpreter/blocks/test_block_return.rb
+++ b/test/risc/interpreter/blocks/test_block_return.rb
@@ -11,36 +11,30 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain   [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, SlotToReg, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
-            SlotToReg, RegToSlot, SlotToReg, FunctionCall, LoadConstant, # 20
-            SlotToReg, OperatorInstruction, IsZero, SlotToReg, LoadConstant,
-            SlotToReg, SlotToReg, RegToSlot, RegToSlot, RegToSlot, # 30
-            RegToSlot, SlotToReg, SlotToReg, RegToSlot, SlotToReg,
-            LoadConstant, RegToSlot, SlotToReg, SlotToReg, DynamicJump, # 40
-            LoadConstant, RegToSlot, Branch, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot, # 50
-            SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg,
-            RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, # 60
-            LoadConstant, SlotToReg, Branch, RegToSlot, RegToSlot,
-            SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, # 70
-            RegToSlot, SlotToReg, RegToSlot, Branch, SlotToReg,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, Branch, # 80
-            RegToSlot, RegToSlot, SlotToReg, SlotToReg, SlotToReg,
-            FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, # 90
-            NilClass, ]
+      check_main_chain [LoadConstant, RegToSlot, SlotToReg, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #10
+                 RegToSlot, SlotToReg, FunctionCall, LoadConstant, SlotToReg, #15
+                 OperatorInstruction, IsZero, SlotToReg, RegToSlot, SlotToReg, #20
+                 SlotToReg, RegToSlot, SlotToReg, LoadConstant, RegToSlot, #25
+                 SlotToReg, SlotToReg, DynamicJump, LoadConstant, RegToSlot, #30
+                 Branch, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #35
+                 SlotToReg, SlotToReg, FunctionReturn, SlotToReg, RegToSlot, #40
+                 Branch, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #45
+                 SlotToReg, SlotToReg, FunctionReturn, SlotToReg, RegToSlot, #50
+                 SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #55
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #60
+                 Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #65
       assert_equal 15 , get_return
     end
 
     def test_load_return
-      load_ins = main_ticks(36)
+      load_ins = main_ticks(24)
       assert_equal LoadConstant ,  load_ins.class
       assert_equal Parfait::ReturnAddress , @interpreter.get_register(load_ins.register).class
     end
 
     def test_load_block
-      load_ins = main_ticks(40)
+      load_ins = main_ticks(28)
       assert_equal DynamicJump ,  load_ins.class
       assert_equal Parfait::Block , @interpreter.get_register(load_ins.register).class
       assert_equal :main_block , @interpreter.get_register(load_ins.register).name
diff --git a/test/risc/interpreter/blocks/test_call_simple_args.rb b/test/risc/interpreter/blocks/test_call_simple_args.rb
index 10691646..6e98baca 100644
--- a/test/risc/interpreter/blocks/test_call_simple_args.rb
+++ b/test/risc/interpreter/blocks/test_call_simple_args.rb
@@ -1,7 +1,7 @@
 require_relative "../helper"
 
 module Risc
-  class BlockCallSimpleWithArg < MiniTest::Test
+  class BlockCallSimpleWithArg# < MiniTest::Test
     include Ticker
     def setup
       @string_input = block_main("a = tenner {|b| return b} ; return a" , tenner)
diff --git a/test/risc/interpreter/calling/test_alloc.rb b/test/risc/interpreter/calling/test_alloc.rb
index e610ff05..640ea671 100644
--- a/test/risc/interpreter/calling/test_alloc.rb
+++ b/test/risc/interpreter/calling/test_alloc.rb
@@ -12,39 +12,39 @@ module Risc
 
     def test_chain
       # show_main_ticks # get output of what is
-      check_main_chain  [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
-            SlotToReg, RegToSlot, SlotToReg, FunctionCall, LoadConstant, # 20
-            SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, SlotToReg,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, SlotToReg, # 30
-            Branch, OperatorInstruction, RegToSlot, RegToSlot, SlotToReg,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 40
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, # 50
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot,
-            Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 60
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain  [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #10
+                 RegToSlot, SlotToReg, FunctionCall, LoadConstant, SlotToReg, #15
+                 LoadConstant, OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, #20
+                 SlotToReg, SlotToReg, SlotToReg, SlotToReg, OperatorInstruction, #25
+                 RegToSlot, RegToSlot, SlotToReg, SlotToReg, RegToSlot, #30
+                 Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #35
+                 SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #40
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #45
+                 Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #50
        assert_equal 10 , get_return
     end
     def base_ticks(num)
-      main_ticks(20 + num)
+      main_ticks(13 + num)
+    end
+    def test_base
+        assert_equal FunctionCall , main_ticks( 13 ).class
     end
     def test_load_factory
-      lod = base_ticks( 0 )
+      lod = base_ticks( 1 )
       assert_load( lod , Parfait::Factory , :r2)
       assert_equal :next_integer , lod.constant.attribute_name
     end
     def test_slot_receiver #load next_object from factory
-      sl = base_ticks( 1 )
+      sl = base_ticks( 2 )
       assert_slot_to_reg( sl , :r2 , 2 , :r1)
     end
     def test_load_nil
-      lod = base_ticks( 2 )
+      lod = base_ticks( 3 )
       assert_load( lod , Parfait::NilClass , :r3)
     end
     def test_nil_check
-      op = base_ticks(3)
+      op = base_ticks(4)
       assert_equal OperatorInstruction , op.class
       assert_equal :- , op.operator
       assert_equal :r3 , op.left.symbol
@@ -53,22 +53,17 @@ module Risc
       assert 0 != @interpreter.get_register(:r3)
     end
     def test_branch
-      br = base_ticks( 4 )
+      br = base_ticks( 5 )
       assert_equal IsNotZero , br.class
       assert br.label.name.start_with?("cont_label")
     end
     def test_load_next_int
-      sl = base_ticks( 5 )
+      sl = base_ticks( 6 )
       assert_slot_to_reg( sl , :r1 , 1 , :r4)
     end
     def test_move_next_back_to_factory
-      int = base_ticks( 6 )
+      int = base_ticks( 7 )
       assert_reg_to_slot( int , :r4 , :r2 , 2)
     end
-    def test_branch_to_next_block
-      br = base_ticks( 11 )
-      assert_equal Branch , br.class
-      assert_equal Parfait::BinaryCode ,  br.label.class
-    end
   end
 end
diff --git a/test/risc/interpreter/calling/test_div10.rb b/test/risc/interpreter/calling/test_div10.rb
index 690e51cf..a4d390d5 100644
--- a/test/risc/interpreter/calling/test_div10.rb
+++ b/test/risc/interpreter/calling/test_div10.rb
@@ -11,39 +11,32 @@ module Risc
 
     def test_chain
       # show_main_ticks # get output of what is
-      check_main_chain [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg,
-            FunctionCall, LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, # 20
-            IsNotZero, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
-            Transfer, Transfer, Branch, LoadData, OperatorInstruction, # 30
-            LoadData, OperatorInstruction, OperatorInstruction, LoadData, Transfer,
-            OperatorInstruction, OperatorInstruction, LoadData, Transfer, OperatorInstruction, # 40
-            OperatorInstruction, LoadData, Transfer, OperatorInstruction, OperatorInstruction,
-            LoadData, OperatorInstruction, LoadData, Transfer, OperatorInstruction, # 50
-            OperatorInstruction, Transfer, LoadData, OperatorInstruction, LoadData,
-            OperatorInstruction, OperatorInstruction, Branch, RegToSlot, RegToSlot, # 60
-            SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg,
-            RegToSlot, RegToSlot, SlotToReg, SlotToReg, SlotToReg, # 70
-            FunctionReturn, SlotToReg, RegToSlot, Branch, SlotToReg,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 80
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, Branch,
-            FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, # 90
-            NilClass, ]
+      check_main_chain [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, SlotToReg, FunctionCall, #10
+                 LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, #15
+                 SlotToReg, RegToSlot, SlotToReg, SlotToReg, Transfer, #20
+                 Transfer, LoadData, OperatorInstruction, LoadData, OperatorInstruction, #25
+                 OperatorInstruction, LoadData, Branch, Transfer, OperatorInstruction, #30
+                 OperatorInstruction, LoadData, Transfer, OperatorInstruction, OperatorInstruction, #35
+                 LoadData, Transfer, OperatorInstruction, OperatorInstruction, LoadData, #40
+                 OperatorInstruction, LoadData, Transfer, OperatorInstruction, OperatorInstruction, #45
+                 Transfer, LoadData, OperatorInstruction, LoadData, OperatorInstruction, #50
+                 OperatorInstruction, RegToSlot, RegToSlot, SlotToReg, SlotToReg, #55
+                 RegToSlot, SlotToReg, Branch, SlotToReg, SlotToReg, #60
+                 FunctionReturn, SlotToReg, RegToSlot, Branch, SlotToReg, #65
+                 SlotToReg, RegToSlot, SlotToReg, SlotToReg, SlotToReg, #70
+                 FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, #75
+                 NilClass,] #80s
        assert_equal 2 , get_return
     end
 
     def test_load_25
-      load_ins = main_ticks 9
+      load_ins = main_ticks 3
       assert_equal LoadConstant ,  load_ins.class
       assert_equal 25 , @interpreter.get_register(load_ins.register).value
     end
-    def test_load_space
-      load_ins = main_ticks 64
-      assert_load load_ins, Parfait::Factory
-    end
     def test_return_class
-      ret = main_ticks(86)
+      ret = main_ticks(71)
       assert_equal FunctionReturn ,  ret.class
       link = @interpreter.get_register( ret.register )
       assert_equal ::Integer , link.class
diff --git a/test/risc/interpreter/calling/test_get_byte.rb b/test/risc/interpreter/calling/test_get_byte.rb
index 015446bb..fed87a25 100644
--- a/test/risc/interpreter/calling/test_get_byte.rb
+++ b/test/risc/interpreter/calling/test_get_byte.rb
@@ -10,23 +10,20 @@ module Risc
     end
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain   [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
-            SlotToReg, RegToSlot, SlotToReg, FunctionCall, LoadConstant, # 20
-            SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, SlotToReg,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, ByteToReg, # 30
-            Branch, RegToSlot, RegToSlot, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot, # 40
-            SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg,
-            RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, # 50
-            LoadConstant, SlotToReg, RegToSlot, RegToSlot, Branch,
-            SlotToReg, SlotToReg, SlotToReg, FunctionReturn, Transfer, # 60
-            SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain  [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #10
+                 RegToSlot, SlotToReg, FunctionCall, LoadConstant, SlotToReg, #15
+                 LoadConstant, OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, #20
+                 SlotToReg, SlotToReg, SlotToReg, ByteToReg, RegToSlot, #25
+                 RegToSlot, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #30
+                 Branch, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, #35
+                 RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #40
+                 SlotToReg, SlotToReg, SlotToReg, FunctionReturn, Transfer, #45
+                 SlotToReg, SlotToReg, Syscall, NilClass,] #50
        assert_equal "H".ord , get_return
     end
     def test_byte_to_reg
-      done = main_ticks(30)
+      done = main_ticks(24)
       assert_equal ByteToReg ,  done.class
       assert_equal "H".ord ,  @interpreter.get_register(done.register)
     end
diff --git a/test/risc/interpreter/calling/test_minus.rb b/test/risc/interpreter/calling/test_minus.rb
index 9896f45f..b9fb6348 100644
--- a/test/risc/interpreter/calling/test_minus.rb
+++ b/test/risc/interpreter/calling/test_minus.rb
@@ -11,23 +11,20 @@ module Risc
 
     def test_minus
       #show_main_ticks # get output of what is
-      check_main_chain [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
-            SlotToReg, RegToSlot, SlotToReg, FunctionCall, LoadConstant, # 20
-            SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, SlotToReg,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, SlotToReg, # 30
-            Branch, OperatorInstruction, RegToSlot, RegToSlot, SlotToReg,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 40
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, # 50
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot,
-            Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 60
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain  [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #10
+                 RegToSlot, SlotToReg, FunctionCall, LoadConstant, SlotToReg, #15
+                 LoadConstant, OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, #20
+                 SlotToReg, SlotToReg, SlotToReg, SlotToReg, OperatorInstruction, #25
+                 RegToSlot, RegToSlot, SlotToReg, SlotToReg, RegToSlot, #30
+                 Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #35
+                 SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #40
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #45
+                 Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #50
        assert_equal 1 , get_return
     end
     def test_op
-      op = main_ticks(32)
+      op = main_ticks(25)
       assert_equal OperatorInstruction , op.class
       assert_equal :- , op.operator
       assert_equal :r2 , op.left.symbol
@@ -36,10 +33,10 @@ module Risc
       assert_equal 5 , @interpreter.get_register(:r3)
     end
     def test_return
-      ret = main_ticks(60)
+      ret = main_ticks(45)
       assert_equal FunctionReturn ,  ret.class
-      assert_equal :r1 ,  ret.register.symbol
-      assert_equal 26160 ,  @interpreter.get_register(ret.register)
+      assert_equal :r3 ,  ret.register.symbol
+      assert_equal 26008 ,  @interpreter.get_register(ret.register)
     end
   end
 end
diff --git a/test/risc/interpreter/calling/test_mod.rb b/test/risc/interpreter/calling/test_mod.rb
index b92b131c..d074f6ce 100644
--- a/test/risc/interpreter/calling/test_mod.rb
+++ b/test/risc/interpreter/calling/test_mod.rb
@@ -10,25 +10,22 @@ module Risc
     end
 
     def test_chain
-      # show_main_ticks # get output of what is
-      check_main_chain [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg,
-            FunctionCall, LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, # 20
-            IsNotZero, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
-            LoadData, OperatorInstruction, Branch, RegToSlot, RegToSlot, # 30
-            SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg,
-            RegToSlot, RegToSlot, SlotToReg, SlotToReg, SlotToReg, # 40
-            FunctionReturn, SlotToReg, RegToSlot, Branch, SlotToReg,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 50
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, Branch,
-            FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, # 60
-            NilClass, ]
+      #show_main_ticks # get output of what is
+      check_main_chain [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, SlotToReg, FunctionCall, #10
+                 LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, #15
+                 SlotToReg, RegToSlot, SlotToReg, SlotToReg, LoadData, #20
+                 OperatorInstruction, RegToSlot, RegToSlot, SlotToReg, SlotToReg, #25
+                 RegToSlot, SlotToReg, Branch, SlotToReg, SlotToReg, #30
+                 FunctionReturn, SlotToReg, RegToSlot, Branch, SlotToReg, #35
+                 SlotToReg, RegToSlot, SlotToReg, SlotToReg, SlotToReg, #40
+                 FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, #45
+                 NilClass,] #50
        assert_equal 2 , get_return
     end
 
     def test_op
-      op = main_ticks(27)
+      op = main_ticks(21)
       assert_equal OperatorInstruction , op.class
       assert_equal :>> , op.operator
       assert_equal :r2 , op.left.symbol
diff --git a/test/risc/interpreter/calling/test_mult.rb b/test/risc/interpreter/calling/test_mult.rb
index 67741cd8..c722faeb 100644
--- a/test/risc/interpreter/calling/test_mult.rb
+++ b/test/risc/interpreter/calling/test_mult.rb
@@ -11,19 +11,16 @@ module Risc
 
     def test_mult
       #show_main_ticks # get output of what is
-      check_main_chain [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
-            SlotToReg, RegToSlot, SlotToReg, FunctionCall, LoadConstant, # 20
-            SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, SlotToReg,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, SlotToReg, # 30
-            Branch, OperatorInstruction, RegToSlot, RegToSlot, SlotToReg,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 40
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, # 50
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot,
-            Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 60
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain  [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #10
+                 RegToSlot, SlotToReg, FunctionCall, LoadConstant, SlotToReg, #15
+                 LoadConstant, OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, #20
+                 SlotToReg, SlotToReg, SlotToReg, SlotToReg, OperatorInstruction, #25
+                 RegToSlot, RegToSlot, SlotToReg, SlotToReg, RegToSlot, #30
+                 Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #35
+                 SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #40
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #45
+                 Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #50
        assert_equal 0 , get_return
     end
     def test_zero
@@ -31,7 +28,7 @@ module Risc
       assert @interpreter.flags[:zero]
     end
     def test_op
-      op = main_ticks(32)
+      op = main_ticks(25)
       assert_equal OperatorInstruction , op.class
       assert_equal :r2 , op.left.symbol
       assert_equal :r3 , op.right.symbol
@@ -39,7 +36,7 @@ module Risc
       assert_equal 2**31 , @interpreter.get_register(:r3)
     end
     def test_overflow
-      main_ticks( 36 )
+      main_ticks( 26 )
       assert @interpreter.flags[:overflow]
     end
   end
diff --git a/test/risc/interpreter/calling/test_plus.rb b/test/risc/interpreter/calling/test_plus.rb
index ffbd9cd9..798c4f43 100644
--- a/test/risc/interpreter/calling/test_plus.rb
+++ b/test/risc/interpreter/calling/test_plus.rb
@@ -11,48 +11,44 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
-            SlotToReg, RegToSlot, SlotToReg, FunctionCall, LoadConstant, # 20
-            SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, SlotToReg,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, SlotToReg, # 30
-            Branch, OperatorInstruction, RegToSlot, RegToSlot, SlotToReg,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 40
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, # 50
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot,
-            Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 60
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #10
+                 RegToSlot, SlotToReg, FunctionCall, LoadConstant, SlotToReg, #15
+                 LoadConstant, OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, #20
+                 SlotToReg, SlotToReg, SlotToReg, SlotToReg, OperatorInstruction, #25
+                 RegToSlot, RegToSlot, SlotToReg, SlotToReg, RegToSlot, #30
+                 Branch, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #35
+                 SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #40
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #45
+                 Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #50
        assert_equal 10 , get_return
     end
     def base_ticks(num)
-      main_ticks(21 + num)
+      main_ticks(13 + num)
     end
-    def test_load_5
-      lod = main_ticks( 12 )
-      assert_load( lod , Parfait::Integer , :r1)
-      assert_equal 5 , lod.constant.value
+    def test_base
+        cal = main_ticks( 13 )
+        assert_equal FunctionCall , cal.class
     end
     def test_load_receiver
-      sl = base_ticks( 6 )
+      sl = base_ticks( 8 )
       assert_slot_to_reg( sl , :r0 , 2 , :r2)
     end
     def test_reduce_receiver
-      sl = base_ticks( 7 )
+      sl = base_ticks( 9 )
       assert_slot_to_reg( sl , :r2 , 2 , :r2)
     end
     def test_slot_args #load args from message
-      sl = base_ticks( 8 )
+      sl = base_ticks( 10 )
       assert_slot_to_reg( sl , :r0 , 9 , :r3)
     end
     def test_reduce_arg
-      sl = base_ticks( 9 )
+      sl = base_ticks( 11 )
       assert_slot_to_reg( sl , :r3 , 2 , :r3)
       assert_equal 5 , @interpreter.get_register(:r3)
     end
     def test_op
-      op = base_ticks(11)
+      op = base_ticks(12)
       assert_equal OperatorInstruction , op.class
       assert_equal :+ , op.operator
       assert_equal :r2 , op.left.symbol
@@ -61,19 +57,19 @@ module Risc
       assert_equal 5 , @interpreter.get_register(:r3)
     end
     def test_move_res_to_int
-      int = base_ticks( 12 )
+      int = base_ticks( 13 )
       assert_reg_to_slot( int , :r2 , :r1 , 2)
     end
     def test_move_int_to_reg
-      int = base_ticks( 13 )
+      int = base_ticks( 14 )
       assert_reg_to_slot( int , :r1 , :r0 , 5)
     end
     def test_move_fix_to_result
-      sl = base_ticks( 14 )
+      sl = base_ticks( 15 )
       assert_slot_to_reg( sl , :r0 , 5 , :r1)
     end
     def test_start_return_sequence
-      sl = base_ticks( 15 )
+      sl = base_ticks( 16 )
       assert_slot_to_reg( sl , :r0 , 6 , :r2)
     end
   end
diff --git a/test/risc/interpreter/calling/test_puts.rb b/test/risc/interpreter/calling/test_puts.rb
index fcba834d..1b0fd134 100644
--- a/test/risc/interpreter/calling/test_puts.rb
+++ b/test/risc/interpreter/calling/test_puts.rb
@@ -11,30 +11,27 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg,
-            FunctionCall, LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, # 20
-            IsNotZero, SlotToReg, RegToSlot, RegToSlot, SlotToReg,
-            SlotToReg, Transfer, Branch, Syscall, Transfer, # 30
-            Transfer, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot, # 40
-            SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg,
-            RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, # 50
-            LoadConstant, SlotToReg, RegToSlot, RegToSlot, SlotToReg,
-            SlotToReg, SlotToReg, Branch, FunctionReturn, Transfer, # 60
-            SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, SlotToReg, FunctionCall, #10
+                 LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, IsNotZero, #15
+                 SlotToReg, RegToSlot, RegToSlot, SlotToReg, SlotToReg, #20
+                 Transfer, Syscall, Transfer, Transfer, SlotToReg, #25
+                 RegToSlot, SlotToReg, Branch, SlotToReg, RegToSlot, #30
+                 SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, #35
+                 RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #40
+                 SlotToReg, SlotToReg, SlotToReg, FunctionReturn, Transfer, #45
+                 SlotToReg, SlotToReg, Syscall, NilClass,] #50
        assert_equal "Hello again" , @interpreter.stdout
        assert_equal 11 , get_return #bytes written
     end
     def test_call
-      cal =  main_ticks(16)
+      cal =  main_ticks(10)
       assert_equal FunctionCall , cal.class
       assert_equal :putstring , cal.method.name
     end
 
     def test_putstring_sys
-      done = main_ticks(29)
+      done = main_ticks(22)
       assert_equal Syscall ,  done.class
       assert_equal "Hello again" , @interpreter.stdout
       assert_equal 11 , @interpreter.get_register(:r0)
@@ -42,21 +39,21 @@ module Risc
       assert_equal "Hello again" , @interpreter.get_register(:r1).to_string
     end
     def test_move_sys_return
-      sl = main_ticks(31)
+      sl = main_ticks(23)
       assert_transfer(sl, :r0 ,:r3)
       assert_equal 11 , @interpreter.get_register(:r3)
     end
     def test_restore_message
-      sl = main_ticks(31)
+      sl = main_ticks(24)
       assert_transfer(sl, :r8 ,:r0)
       assert_equal Parfait::Message , @interpreter.get_register(:r0).class
     end
     def test_move_sys_return
-      sl = main_ticks(36)
+      sl = main_ticks(30)
       assert_reg_to_slot( sl , :r1 ,:r2 , 5)
     end
     def test_return
-      done = main_ticks(59)
+      done = main_ticks(44)
       assert_equal FunctionReturn ,  done.class
     end
 
diff --git a/test/risc/interpreter/calling/test_set_byte.rb b/test/risc/interpreter/calling/test_set_byte.rb
index 9aff0792..cef94ad5 100644
--- a/test/risc/interpreter/calling/test_set_byte.rb
+++ b/test/risc/interpreter/calling/test_set_byte.rb
@@ -11,22 +11,19 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain   [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 20
-            SlotToReg, FunctionCall, SlotToReg, SlotToReg, RegToSlot,
-            SlotToReg, SlotToReg, SlotToReg, RegToByte, SlotToReg, # 30
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 40
-            SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, Branch, SlotToReg, RegToSlot, # 50
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ]
+      check_main_chain   [LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #5
+                 LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #10
+                 RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg, #15
+                 FunctionCall, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #20
+                 SlotToReg, SlotToReg, RegToByte, SlotToReg, SlotToReg, #25
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #30
+                 SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #35
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #40
+                 Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #45
        assert_equal "K".ord , get_return
     end
     def test_reg_to_byte
-      done = main_ticks(29)
+      done = main_ticks(23)
       assert_equal RegToByte ,  done.class
       assert_equal "K".ord ,  @interpreter.get_register(done.register)
     end
diff --git a/test/risc/interpreter/conditional/test_if_constant.rb b/test/risc/interpreter/conditional/test_if_constant.rb
index 29dda263..ac78776b 100644
--- a/test/risc/interpreter/conditional/test_if_constant.rb
+++ b/test/risc/interpreter/conditional/test_if_constant.rb
@@ -11,12 +11,11 @@ module Risc
 
     def test_if
         #show_main_ticks # get output of what is in main
-        check_main_chain [LoadConstant, LoadConstant, OperatorInstruction, IsZero, LoadConstant,
-            OperatorInstruction, IsZero, LoadConstant, RegToSlot, Branch, # 10
-            SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg,
-            RegToSlot, RegToSlot, SlotToReg, SlotToReg, SlotToReg, # 20
-            FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall,
-            NilClass, ]
+        check_main_chain  [LoadConstant, LoadConstant, OperatorInstruction, IsZero, LoadConstant, #5
+                 OperatorInstruction, IsZero, LoadConstant, RegToSlot, Branch, #10
+                 SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg, #15
+                 SlotToReg, FunctionReturn, Transfer, SlotToReg, SlotToReg, #20
+                 Syscall, NilClass,] #25
       assert_equal 1 , get_return
     end
     def test_load_10
@@ -39,9 +38,5 @@ module Risc
       assert_equal IsZero , check.class
       assert check.label.name.start_with?("false_label") , check.label.name
     end
-    def test_exit
-      done = main_ticks(25)
-      assert_equal Syscall ,  done.class
-    end
   end
 end
diff --git a/test/risc/interpreter/test_dynamic_call.rb b/test/risc/interpreter/test_dynamic_call.rb
index ad924d75..881b235e 100644
--- a/test/risc/interpreter/test_dynamic_call.rb
+++ b/test/risc/interpreter/test_dynamic_call.rb
@@ -11,32 +11,29 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain  [LoadConstant, RegToSlot, LoadConstant, SlotToReg, SlotToReg,
-            SlotToReg, OperatorInstruction, IsZero, SlotToReg, SlotToReg, # 10
-            LoadConstant, RegToSlot, LoadConstant, LoadConstant, SlotToReg,
-            SlotToReg, LoadConstant, OperatorInstruction, IsZero, SlotToReg, # 20
-            OperatorInstruction, IsZero, SlotToReg, Branch, LoadConstant,
-            OperatorInstruction, IsZero, SlotToReg, OperatorInstruction, IsZero, # 30
-            SlotToReg, Branch, LoadConstant, OperatorInstruction, IsZero,
-            SlotToReg, OperatorInstruction, IsZero, SlotToReg, Branch, # 40
-            LoadConstant, OperatorInstruction, IsZero, SlotToReg, OperatorInstruction,
-            IsZero, SlotToReg, Branch, LoadConstant, OperatorInstruction, # 50
-            IsZero, SlotToReg, OperatorInstruction, IsZero, SlotToReg,
-            Branch, LoadConstant, OperatorInstruction, IsZero, SlotToReg, # 60
-            OperatorInstruction, IsZero, RegToSlot, LoadConstant, SlotToReg,
-            LoadConstant, SlotToReg, SlotToReg, RegToSlot, RegToSlot, # 70
-            RegToSlot, RegToSlot, SlotToReg, SlotToReg, RegToSlot,
-            LoadConstant, SlotToReg, RegToSlot, SlotToReg, LoadConstant, # 80
-            SlotToReg, DynamicJump, LoadConstant, SlotToReg, LoadConstant,
-            OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, SlotToReg, # 90
-            SlotToReg, LoadData, OperatorInstruction, Branch, RegToSlot,
-            RegToSlot, SlotToReg, SlotToReg, RegToSlot, LoadConstant, # 100
-            SlotToReg, RegToSlot, RegToSlot, SlotToReg, SlotToReg,
-            SlotToReg, FunctionReturn, SlotToReg, RegToSlot, Branch, # 110
-            SlotToReg, SlotToReg, RegToSlot, Branch, LoadConstant,
-            SlotToReg, RegToSlot, RegToSlot, SlotToReg, SlotToReg, # 120
-            SlotToReg, FunctionReturn, Transfer, SlotToReg, SlotToReg,
-            Syscall, NilClass, ]
+      check_main_chain  [LoadConstant, RegToSlot, LoadConstant, SlotToReg, SlotToReg, #5
+                 SlotToReg, OperatorInstruction, IsZero, SlotToReg, SlotToReg, #10
+                 LoadConstant, RegToSlot, LoadConstant, LoadConstant, SlotToReg, #15
+                 SlotToReg, LoadConstant, OperatorInstruction, IsZero, SlotToReg, #20
+                 OperatorInstruction, IsZero, SlotToReg, Branch, LoadConstant, #25
+                 OperatorInstruction, IsZero, SlotToReg, OperatorInstruction, IsZero, #30
+                 SlotToReg, Branch, LoadConstant, OperatorInstruction, IsZero, #35
+                 SlotToReg, OperatorInstruction, IsZero, SlotToReg, Branch, #40
+                 LoadConstant, OperatorInstruction, IsZero, SlotToReg, OperatorInstruction, #45
+                 IsZero, SlotToReg, Branch, LoadConstant, OperatorInstruction, #50
+                 IsZero, SlotToReg, OperatorInstruction, IsZero, SlotToReg, #55
+                 Branch, LoadConstant, OperatorInstruction, IsZero, SlotToReg, #60
+                 OperatorInstruction, IsZero, RegToSlot, LoadConstant, SlotToReg, #65
+                 RegToSlot, SlotToReg, SlotToReg, RegToSlot, LoadConstant, #70
+                 SlotToReg, RegToSlot, SlotToReg, LoadConstant, SlotToReg, #75
+                 DynamicJump, LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, #80
+                 IsNotZero, SlotToReg, RegToSlot, SlotToReg, SlotToReg, #85
+                 LoadData, OperatorInstruction, RegToSlot, RegToSlot, SlotToReg, #90
+                 SlotToReg, RegToSlot, SlotToReg, Branch, SlotToReg, #95
+                 SlotToReg, FunctionReturn, SlotToReg, RegToSlot, Branch, #100
+                 SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg, #105
+                 SlotToReg, FunctionReturn, Transfer, SlotToReg, SlotToReg, #110
+                 Syscall, NilClass,] #115
 
        assert_equal ::Integer , get_return.class
        assert_equal 1 , get_return
@@ -54,17 +51,17 @@ module Risc
     end
 
     def test_dyn
-      cal = main_ticks(82)
+      cal = main_ticks(76)
       assert_equal DynamicJump ,  cal.class
     end
     def test_return
-      ret = main_ticks(122)
+      ret = main_ticks(107)
       assert_equal FunctionReturn ,  ret.class
       link = @interpreter.get_register( ret.register )
       assert_equal ::Integer , link.class
     end
     def test_sys
-      sys = main_ticks(126)
+      sys = main_ticks(111)
       assert_equal Syscall ,  sys.class
     end
   end
diff --git a/test/risc/interpreter/test_events.rb b/test/risc/interpreter/test_events.rb
index b4b2fc4a..23138862 100644
--- a/test/risc/interpreter/test_events.rb
+++ b/test/risc/interpreter/test_events.rb
@@ -19,7 +19,7 @@ module Risc
       @instruction_events << was
     end
     def length
-      37
+      27
     end
     def test_state_change
       @interpreter.register_event :state_changed , self
@@ -39,14 +39,13 @@ module Risc
 
     def test_chain
       #show_ticks # get output of what is
-      check_chain [Branch, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
-            LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot, # 10
-            RegToSlot, RegToSlot, RegToSlot, SlotToReg, LoadConstant,
-            RegToSlot, LoadConstant, RegToSlot, FunctionCall, LoadConstant, # 20
-            RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot,
-            LoadConstant, SlotToReg, RegToSlot, RegToSlot, SlotToReg, # 30
-            SlotToReg, SlotToReg, FunctionReturn, Transfer, SlotToReg,
-            SlotToReg, Syscall, NilClass, ]
+      check_chain [Branch, LoadConstant, SlotToReg, SlotToReg, RegToSlot, #5
+                 LoadConstant, RegToSlot, SlotToReg, LoadConstant, RegToSlot, #10
+                 LoadConstant, RegToSlot, FunctionCall, LoadConstant, RegToSlot, #15
+                 Branch, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #20
+                 SlotToReg, SlotToReg, FunctionReturn, Transfer, SlotToReg, #25
+                 SlotToReg, Syscall, NilClass,] #30
+
       assert_equal ::Integer , get_return.class
       assert_equal 5 , get_return
     end
diff --git a/test/risc/interpreter/test_return.rb b/test/risc/interpreter/test_return.rb
index 660735e9..a7c763d0 100644
--- a/test/risc/interpreter/test_return.rb
+++ b/test/risc/interpreter/test_return.rb
@@ -11,10 +11,9 @@ module Risc
 
     def test_chain
       #show_main_ticks # get output of what is
-      check_main_chain [LoadConstant, RegToSlot, Branch, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot, # 10
-            SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ] # 20
+      check_main_chain [LoadConstant, RegToSlot, Branch, SlotToReg, SlotToReg, #5
+                 RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, #10
+                 Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #15
       assert_equal 5 , get_return
     end
 
@@ -25,17 +24,50 @@ module Risc
     end
     def test_load_5
       load_ins = main_ticks(1)
-      assert_equal LoadConstant ,  load_ins.class
-      assert_equal 5 , @interpreter.get_register(load_ins.register).value
+      assert_load  load_ins , Parfait::Integer
+      assert_equal 5 ,  load_ins.constant.value
     end
-    def test_return
-      ret = main_ticks(14)
+    def test_store_ret_val
+      sl = main_ticks( 2 )
+      assert_reg_to_slot( sl , :r1 , :r0 , 5)
+    end
+    def test_branch
+      sl = main_ticks( 3 )
+      assert_equal Branch , sl.class
+      assert_equal "return_label" , sl.label.name
+    end
+    def test_load_ret
+      sl = main_ticks( 4 )
+      assert_slot_to_reg( sl , :r0 , 5 , :r1)
+    end
+    def test_load_caller
+      sl = main_ticks( 5 )
+      assert_slot_to_reg( sl , :r0 , 6 , :r2)
+    end
+    def test_load_caller_ret
+      sl = main_ticks( 6 )
+      assert_reg_to_slot( sl , :r1 , :r2 , 5)
+    end
+    def test_load_ret_add
+      sl = main_ticks( 7 )
+      assert_slot_to_reg( sl , :r0 , 4 , :r3)
+    end
+    def test_reduce_addedd
+      sl = main_ticks( 8 )
+      assert_slot_to_reg( sl , :r3 , 2 , :r3)
+    end
+    def test_load_next_message
+      sl = main_ticks( 9 )
+      assert_slot_to_reg( sl , :r0 , 6 , :r0)
+    end
+    def test_function_return
+      ret = main_ticks(10)
       assert_equal FunctionReturn ,  ret.class
       link = @interpreter.get_register( ret.register )
       assert_equal ::Integer , link.class
     end
     def test_transfer
-      transfer = main_ticks(15)
+      transfer = main_ticks(11)
       assert_equal Transfer ,  transfer.class
     end
   end
diff --git a/test/risc/interpreter/while/test_while_simple.rb b/test/risc/interpreter/while/test_while_simple.rb
index 8f95f794..4896ddd8 100644
--- a/test/risc/interpreter/while/test_while_simple.rb
+++ b/test/risc/interpreter/while/test_while_simple.rb
@@ -11,13 +11,13 @@ module Risc
 
     def test_while
         #show_main_ticks # get output of what is in main
-        check_main_chain  [LoadConstant, RegToSlot, SlotToReg, LoadConstant, OperatorInstruction,
-            IsZero, LoadConstant, OperatorInstruction, IsZero, LoadConstant, # 10
-            RegToSlot, Branch, SlotToReg, LoadConstant, OperatorInstruction,
-            IsZero, SlotToReg, RegToSlot, Branch, SlotToReg, # 20
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn, # 30
-            Transfer, SlotToReg, SlotToReg, Syscall, NilClass, ]
+        check_main_chain  [LoadConstant, RegToSlot, SlotToReg, LoadConstant, OperatorInstruction, #5
+                 IsZero, LoadConstant, OperatorInstruction, IsZero, LoadConstant, #10
+                 RegToSlot, Branch, SlotToReg, LoadConstant, OperatorInstruction, #15
+                 IsZero, SlotToReg, RegToSlot, Branch, SlotToReg, #20
+                 SlotToReg, RegToSlot, SlotToReg, SlotToReg, SlotToReg, #25
+                 FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, #30
+                 NilClass,] #35
       assert_kind_of Parfait::NilClass , get_return
     end
     def test_load_false_const
diff --git a/test/risc/test_builder1.rb b/test/risc/test_builder1.rb
index 74ee6633..699a05e3 100644
--- a/test/risc/test_builder1.rb
+++ b/test/risc/test_builder1.rb
@@ -43,7 +43,7 @@ module Risc
     end
     def test_allocate_len
       int = @builder.allocate_int
-      assert_equal 28 , @builder.compiler.risc_instructions.length
+      assert_equal 22 , @builder.compiler.risc_instructions.length
     end
   end
 end
diff --git a/test/risc/test_collector.rb b/test/risc/test_collector.rb
index 24e1c960..e3a8fef1 100644
--- a/test/risc/test_collector.rb
+++ b/test/risc/test_collector.rb
@@ -11,7 +11,7 @@ module Risc
 
     def test_simple_collect
       objects = Collector.collect_space(@linker)
-      assert_equal 620 ,  objects.length , objects.length.to_s
+      assert_equal 619 ,  objects.length , objects.length.to_s
     end
 
     def test_collect_all_types
@@ -55,7 +55,7 @@ module Risc
 
     def test_simple_collect
       objects = Collector.collect_space(@linker)
-      assert_equal 2420, objects.length , objects.length.to_s
+      assert_equal 2419, objects.length , objects.length.to_s
     end
 
     def test_integer_positions
diff --git a/test/risc/test_register_value.rb b/test/risc/test_register_value.rb
index 55fa698b..905c609f 100644
--- a/test/risc/test_register_value.rb
+++ b/test/risc/test_register_value.rb
@@ -58,11 +58,6 @@ module Risc
       assert_equal :next_message , message.index
       assert_equal @r0 , message.register
     end
-    def test_return
-      ret = @r0.function_return
-      assert_equal FunctionReturn , ret.class
-      assert_equal @r0 , ret.register
-    end
     def test_operator
       ret = @r0.op :<< , @r1
       assert_equal OperatorInstruction , ret.class