diff --git a/test/vool/to_mom/test_if_condition.rb b/test/vool/to_mom/test_if_condition.rb
index 37202075..5fa12079 100644
--- a/test/vool/to_mom/test_if_condition.rb
+++ b/test/vool/to_mom/test_if_condition.rb
@@ -8,7 +8,7 @@ module Vool
 
     def setup
       Risc.machine.boot
-      @ins = compile_first_method( "if(@a == 5) ; 5.mod4 ; else; 4.mod4 ; end")
+      @ins = compile_first_method( "if(5.mod4) ; @a = 6 ; else; @a = 5 ; end")
     end
 
     def test_condition
diff --git a/test/vool/to_mom/test_if_no_else.rb b/test/vool/to_mom/test_if_no_else.rb
index 22b7b063..a43376df 100644
--- a/test/vool/to_mom/test_if_no_else.rb
+++ b/test/vool/to_mom/test_if_no_else.rb
@@ -8,7 +8,7 @@ module Vool
 
     def setup
       Risc.machine.boot
-      @ins = compile_first_method( "if(@a) ; 5.mod4 ; end")
+      @ins = compile_first_method( "if(@a) ; @a = 5 ; end")
     end
 
     def test_condition_compiles_to_check
@@ -24,7 +24,7 @@ module Vool
       assert_equal Label , @ins.last.class , @ins
     end
     def test_array
-      check_array [TruthCheck,Label,MessageSetup,ArgumentTransfer,SimpleCall,Label], @ins
+      check_array  [TruthCheck, Label, SlotLoad, Label], @ins
     end
   end
 end
diff --git a/test/vool/to_mom/test_if_simple.rb b/test/vool/to_mom/test_if_simple.rb
index b05b35f3..ee0f1a87 100644
--- a/test/vool/to_mom/test_if_simple.rb
+++ b/test/vool/to_mom/test_if_simple.rb
@@ -8,7 +8,7 @@ module Vool
 
     def setup
       Risc.machine.boot
-      @ins = compile_first_method( "if(@a) ; 5.mod4 ; else; 4.mod4 ; end")
+      @ins = compile_first_method( "if(@a) ; @a = 5 ; else; @a = 6 ; end")
     end
 
     def test_condition_compiles_to_check
@@ -24,8 +24,8 @@ module Vool
       assert_equal Label , @ins.last.class , @ins
     end
     def test_array
-      check_array [TruthCheck, Label, MessageSetup, ArgumentTransfer, SimpleCall, Jump ,
-                  Label, MessageSetup, ArgumentTransfer, SimpleCall, Label] , @ins
+      check_array [TruthCheck, Label, SlotLoad, Jump, Label, SlotLoad ,
+                   Label] , @ins
     end
   end
 end
diff --git a/test/vool/to_mom/test_while_simple.rb b/test/vool/to_mom/test_while_simple.rb
index cb0c481b..a028c765 100644
--- a/test/vool/to_mom/test_while_simple.rb
+++ b/test/vool/to_mom/test_while_simple.rb
@@ -8,7 +8,7 @@ module Vool
 
     def setup
       Risc.machine.boot
-      @ins = compile_first_method( "while(@a) ; 5.mod4 ; end")
+      @ins = compile_first_method( "while(@a) ; @a = 5 ; end")
     end
 
     def test_compiles_as_while
@@ -21,7 +21,7 @@ module Vool
       assert_equal SlotDefinition , @ins.next.condition.class , @ins
     end
     def test_array
-      check_array [Label,TruthCheck,MessageSetup,ArgumentTransfer,SimpleCall,Jump,Label] , @ins
+      check_array [Label, TruthCheck, SlotLoad, Jump, Label], @ins
     end
   end
 end