diff --git a/test/compiler/fragments/test_methods.rb b/test/compiler/fragments/test_methods.rb
deleted file mode 100644
index ed35d3dd..00000000
--- a/test/compiler/fragments/test_methods.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-require_relative 'helper'
-
-module Virtual
-  class TestMethods < MiniTest::Test
-    include Fragments
-
-    def test_simplest_function
-      @string_input    = <<HERE
-class Object
-  int main()
-    return 5
-  end
-end
-HERE
-      @expect = [[MethodEnter,Set] ,[MethodReturn]]
-      check
-    end
-
-
-    def test_second_simplest_function
-      @string_input    = <<HERE
-class Object
-  int main()
-    int x = 5
-    return x
-  end
-end
-HERE
-      @expect = [[Virtual::MethodEnter,Set],[Virtual::MethodReturn]]
-      check
-    end
-
-    def test_puts_string
-      @string_input    = <<HERE
-class Object
-  int puts(ref str)
-    return str
-  end
-  int main()
-    puts("Hello")
-  end
-end
-HERE
-      @expect = [[MethodEnter ,  Register::GetSlot, Set, Set , Set, Set, MethodCall],[MethodReturn]]
-      check
-    end
-
-    def test_int_function
-      @string_input    = <<HERE
-class Integer < Object
-  int times(int x)
-    return x
-  end
-end
-HERE
-      @expect = [[Virtual::MethodEnter] , [Virtual::MethodReturn]]
-      check
-      cla = Virtual.machine.space.get_class_by_name :Integer
-      assert cla.get_instance_method( :times )
-    end
-
-    def test_function_ops
-      @string_input    = <<HERE
-class Object
-  int foo(int abba)
-   abba = 5
-   2 + 5
-  end
-end
-HERE
-      @expect = [[Virtual::MethodEnter] , [Virtual::MethodReturn]]
-      check
-    end
-
-    def test_function_if
-      @string_input    = <<HERE
-class Object
-  int main()
-    if(0)
-      return 42
-    else
-      return 667
-    end
-  end
-end
-HERE
-      @expect = [[MethodEnter,Set,Register::IsZeroBranch] , [Set,Register::AlwaysBranch],
-                  [Set],[],[MethodReturn]]
-      check
-    end
-
-    def test_while
-      @string_input    = <<HERE
-class Object
-  int foo()
-    while(1)
-      3
-    end
-  end
-end
-HERE
-      @expect = [[Virtual::MethodEnter],[Virtual::MethodReturn]]
-      check
-    end
-
-    def test_function_while
-      @string_input    = <<HERE
-class Object
-  int fibonaccit(int n)
-    int a = 0
-    while(n)
-      int some = 43
-      int other = some * 4
-    end
-  end
-end
-HERE
-      @expect = [[Virtual::MethodEnter],[Virtual::MethodReturn]]
-      check
-    end
-
-    def test_function_return
-      @string_input    = <<HERE
-class Object
-  int retvar(int n)
-    int i = 5
-    return i
-  end
-end
-HERE
-      @expect = [[Virtual::MethodEnter],[Virtual::MethodReturn]]
-      check
-    end
-
-    def test_function_return_if
-      @string_input    = <<HERE
-class Object
-  int main()
-    int n = 10
-    if( n > 5)
-      return 10
-    else
-      return 20
-    end
-  end
-end
-HERE
-      @expect = [[MethodEnter,Set,Set,Register::GetSlot,Register::GetSlot,
-                  Register::OperatorInstruction,Register::IsZeroBranch],
-                  [Set,Register::AlwaysBranch],[Set],[],[MethodReturn]]
-      check
-    end
-
-    def test_function_return_while
-      @string_input    = <<HERE
-class Object
-  int main()
-    int n = 10
-    while( n > 5)
-      n = n + 1
-      return n
-    end
-  end
-end
-HERE
-      @expect = [[MethodEnter,Set],
-                 [Set,Register::GetSlot,Register::GetSlot,Register::OperatorInstruction,
-                   Register::IsZeroBranch,Set,Register::GetSlot,Register::GetSlot,
-                   Register::OperatorInstruction,Set,Register::AlwaysBranch] ,
-                   [],[MethodReturn]]
-      check
-    end
-  end
-end
diff --git a/test/compiler/statements/test_all.rb b/test/compiler/statements/test_all.rb
index a2f1d4bd..dbe9e8ae 100644
--- a/test/compiler/statements/test_all.rb
+++ b/test/compiler/statements/test_all.rb
@@ -1,2 +1,5 @@
 require_relative "test_if"
 require_relative "test_return"
+require_relative "test_assign"
+require_relative "test_call"
+require_relative "test_while"
diff --git a/test/compiler/statements/test_while.rb b/test/compiler/statements/test_while.rb
new file mode 100644
index 00000000..b033fab3
--- /dev/null
+++ b/test/compiler/statements/test_while.rb
@@ -0,0 +1,61 @@
+require_relative 'helper'
+
+module Register
+  class TestWhile < MiniTest::Test
+    include Statements
+
+
+    def test_while_mini
+      @string_input    = <<HERE
+class Object
+  int main()
+    while(1)
+      return 3
+    end
+  end
+end
+HERE
+      @expect = [[Virtual::MethodEnter],[LoadConstant,IsZeroBranch,LoadConstant,AlwaysBranch],
+                  [],[Virtual::MethodReturn]]
+      check
+    end
+
+    def test_while_assign
+      @string_input    = <<HERE
+class Object
+  int main()
+    int n = 5
+    while(n > 0)
+      n = n - 1
+    end
+  end
+end
+HERE
+      @expect = [[Virtual::MethodEnter,LoadConstant,SetSlot],[GetSlot,LoadConstant,OperatorInstruction,
+                  IsZeroBranch,GetSlot,LoadConstant,OperatorInstruction,SetSlot,AlwaysBranch],
+                  [],[Virtual::MethodReturn]]
+      check
+    end
+
+
+    def test_while_return
+      @string_input    = <<HERE
+class Object
+  int main()
+    int n = 10
+    while( n > 5)
+      n = n + 1
+      return n
+    end
+  end
+end
+HERE
+      @expect = [[Virtual::MethodEnter,LoadConstant,SetSlot],
+                 [GetSlot,LoadConstant,OperatorInstruction,IsZeroBranch,
+                   GetSlot,LoadConstant,OperatorInstruction,SetSlot,
+                   GetSlot,AlwaysBranch] ,
+                   [],[Virtual::MethodReturn]]
+      check
+    end
+  end
+end