diff --git a/lib/parfait/space.rb b/lib/parfait/space.rb
index 441d8589..184a62cb 100644
--- a/lib/parfait/space.rb
+++ b/lib/parfait/space.rb
@@ -38,7 +38,7 @@ module Parfait
         add_type(cl.instance_type)
       end
       101.times { @integers = Integer.new(0,@integers) }
-      200.times { @addresses = ReturnAddress.new(0,@addresses) }
+      300.times { @addresses = ReturnAddress.new(0,@addresses) }
       message = Message.new(nil)
       50.times do
         @messages = Message.new message
diff --git a/test/parfait/test_space.rb b/test/parfait/test_space.rb
index 4583ab2c..50e2bd62 100644
--- a/test/parfait/test_space.rb
+++ b/test/parfait/test_space.rb
@@ -114,7 +114,7 @@ module Parfait
         count += 1
         addr = addr.next_integer
       end
-      assert_equal 200, count
+      assert_equal 300, count
     end
 
     def test_messages
diff --git a/test/risc/interpreter/calling/test_minus.rb b/test/risc/interpreter/calling/test_minus.rb
index 3969faf4..a9529c3f 100644
--- a/test/risc/interpreter/calling/test_minus.rb
+++ b/test/risc/interpreter/calling/test_minus.rb
@@ -45,7 +45,7 @@ module Risc
       ret = main_ticks(63)
       assert_equal FunctionReturn ,  ret.class
       assert_equal :r1 ,  ret.register.symbol
-      assert_equal 21732 ,  @interpreter.get_register(ret.register)
+      assert_equal 23332 ,  @interpreter.get_register(ret.register)
     end
     def test_sys
       sys = main_ticks(68)
diff --git a/test/risc/test_interpreter.rb b/test/risc/test_interpreter.rb
index 80be4b81..0efe5c28 100644
--- a/test/risc/test_interpreter.rb
+++ b/test/risc/test_interpreter.rb
@@ -54,7 +54,7 @@ module Risc
     end
     def test_pc1
       @interpreter.tick
-      assert_equal 21304 , @interpreter.pc
+      assert_equal 22904 , @interpreter.pc
     end
     def test_tick2
       @interpreter.tick
@@ -68,7 +68,7 @@ module Risc
     def test_pc2
       @interpreter.tick
       @interpreter.tick
-      assert_equal 21308 , @interpreter.pc
+      assert_equal 22908 , @interpreter.pc
     end
     def test_tick_14_jump
       14.times {@interpreter.tick}
diff --git a/test/risc/test_linker.rb b/test/risc/test_linker.rb
index 7a849226..d5c3bf82 100644
--- a/test/risc/test_linker.rb
+++ b/test/risc/test_linker.rb
@@ -25,7 +25,7 @@ module Risc
       assert_equal 0 ,  Position.get(@linker.cpu_init).at
     end
     def test_cpu_at
-      assert_equal "0x61ec" ,  Position.get(@linker.cpu_init.first).to_s
+      assert_equal "0x682c" ,  Position.get(@linker.cpu_init.first).to_s
     end
     def test_cpu_label
       assert_equal Position ,  Position.get(@linker.cpu_init.first).class