Merge pull request #1429 from suzukaze/fix-order-of-expected-and-actual

I fix order of expected and actual from basicobject.rb to true.rb in folder '/test/t'.

30 files changed, 508 insertions, 508 deletions

diff --git a/test/t/basicobject.rb b/test/t/basicobject.rb
index d4c344ca9..f33171266 100644
--- a/test/t/basicobject.rb
+++ b/test/t/basicobject.rb
@@ -2,7 +2,7 @@
 # BasicObject
 
 assert('BasicObject') do
-  assert_equal(BasicObject.class, Class)
+  assert_equal(Class, BasicObject.class)
 end
 
 assert('BasicObject superclass') do
diff --git a/test/t/bs_block.rb b/test/t/bs_block.rb
index 47ecece86..91de9141d 100644
--- a/test/t/bs_block.rb
+++ b/test/t/bs_block.rb
@@ -14,7 +14,7 @@ assert('BS Block 1') do
 end
 
 assert('BS Block 2') do
-  assert_equal [1,2,3].find{|x| x == 2}, 2
+  assert_equal 2, [1,2,3].find{|x| x == 2}
 end
 
 assert('BS Block 3') do
@@ -24,7 +24,7 @@ assert('BS Block 3') do
       [1, 2, 3].each(&block)
     end
   end
-  assert_equal E.new.find {|x| x == 2 }, 2
+  assert_equal 2, E.new.find {|x| x == 2 }
 end
 
 assert('BS Block 3') do
@@ -32,7 +32,7 @@ assert('BS Block 3') do
   for x in [1, 2, 3]
     sum += x
   end
-  assert_equal sum, 6
+  assert_equal 6, sum
 end
 
 assert('BS Block 4') do
@@ -40,7 +40,7 @@ assert('BS Block 4') do
   for x in (1..5)
     sum += x
   end
-  assert_equal sum, 15
+  assert_equal 15, sum
 end
 
 assert('BS Block 5') do
@@ -48,7 +48,7 @@ assert('BS Block 5') do
   for x in []
     sum += x
   end
-  assert_equal sum, 0
+  assert_equal 0, sum
 end
 
 assert('BS Block 6') do
@@ -76,7 +76,7 @@ assert('BS Block 7') do
 end
 
 assert('BS Block 8') do
-  assert_equal (1..3).to_a, [1, 2, 3]
+  assert_equal [1, 2, 3], (1..3).to_a
 end
 
 assert('BS Block 9') do
@@ -196,7 +196,7 @@ assert('BS Block 16') do
     m{|ib,jb|
       ib*2+jb
     }
-  end 
+  end
 end
 
 assert('BS Block 17') do
@@ -217,7 +217,7 @@ assert('BS Block 18') do
     yield 10
   end
 
-  assert_equal(21) do   
+  assert_equal(21) do
     iter{|a|
       iter{|a|
         a + 1
@@ -404,7 +404,7 @@ end
 
 assert('BS Block 32') do
   r = false; 1.times{|&b| r = b}
-  assert_equal r.class, NilClass
+  assert_equal NilClass, r.class
 end
 
 assert('BS Block [ruby-core:14395]') do
@@ -457,7 +457,7 @@ assert("BS Block 33") do
       :bad
     end
   end
-  assert_equal TestReturnFromNestedBlock.test, :ok
+  assert_equal :ok, TestReturnFromNestedBlock.test
 end
 
 assert("BS Block 34") do
@@ -471,7 +471,7 @@ assert("BS Block 34") do
       :bad
     end
   end
-  assert_equal TestReturnFromNestedBlock_BSBlock34.test, :ok
+  assert_equal :ok, TestReturnFromNestedBlock_BSBlock34.test
 end
 
 assert("BS Block 35") do
@@ -485,5 +485,5 @@ assert("BS Block 35") do
       :bad
     end
   end
-  assert_equal TestReturnFromNestedBlock_BSBlock35.test, :ok
+  assert_equal :ok, TestReturnFromNestedBlock_BSBlock35.test
 end
diff --git a/test/t/class.rb b/test/t/class.rb
index 9ba490d93..95dbafbb1 100644
--- a/test/t/class.rb
+++ b/test/t/class.rb
@@ -2,11 +2,11 @@
 # Class ISO Test
 
 assert('Class', '15.2.3') do
-  assert_equal(Class.class, Class)
+  assert_equal(Class, Class.class)
 end
 
 assert('Class superclass', '15.2.3.2') do
-  assert_equal(Class.superclass, Module)
+  assert_equal(Module, Class.superclass)
 end
 
 # Class#initialize '15.2.3.3.1' is tested in Class#new
@@ -52,48 +52,48 @@ assert('Class#new', '15.2.3.3.3') do
     def result; @result; end
   end
 
-  assert_equal(TestClass.new(:arg).result, :only_args)
+  assert_equal(:only_args, TestClass.new(:arg).result)
   # with block doesn't work yet
 end
 
 assert('Class#superclass', '15.2.3.3.4') do
   class SubClass < String; end
-  assert_equal(SubClass.superclass, String)
+  assert_equal(String, SubClass.superclass)
 end
 
 # Not ISO specified
 
 assert('Class 1') do
   class C1; end
-  assert_equal(C1.class, Class)
+  assert_equal(Class, C1.class)
 end
 
 assert('Class 2') do
   class C2; end
-  assert_equal(C2.new.class, C2)
+  assert_equal(C2, C2.new.class)
 end
 
 assert('Class 3') do
   class C3; end
-  assert_equal(C3.new.class.class, Class)
+  assert_equal(Class, C3.new.class.class)
 end
 
 assert('Class 4') do
   class C4_A; end
   class C4 < C4_A; end
-  assert_equal(C4.class, Class)
+  assert_equal(Class, C4.class)
 end
 
 assert('Class 5') do
   class C5_A; end
   class C5 < C5_A; end
-  assert_equal(C5.new.class, C5)
+  assert_equal(C5, C5.new.class)
 end
 
 assert('Class 6') do
   class C6_A; end
   class C6 < C6_A; end
-  assert_equal(C6.new.class.class, Class)
+  assert_equal(Class, C6.new.class.class)
 end
 
 assert('Class 7') do
@@ -129,13 +129,13 @@ end
 
 assert('Class Module 1') do
   module M; end
-  assert_equal(M.class, Module)
+  assert_equal(Module, M.class)
 end
 
 assert('Class Module 2') do
   module M; end
   class C; include M; end
-  assert_equal(C.new.class, C)
+  assert_equal(C, C.new.class)
 end
 
 # nested class
@@ -148,13 +148,13 @@ end
 assert('Class Nested 2') do
   class A; end
   class A::B; end
-  assert_equal(A::B.new.class, A::B)
+  assert_equal(A::B, A::B.new.class)
 end
 
 assert('Class Nested 3') do
   class A; end
   class A::B; end
-  assert_equal(A::B.new.class.class, Class)
+  assert_equal(Class, A::B.new.class.class)
 end
 
 assert('Class Nested 4') do
@@ -168,14 +168,14 @@ assert('Class Nested 5') do
   class A; end
   class A::B; end
   class A::B::C; end
-  assert_equal(A::B::C.class, Class)
+  assert_equal(Class, A::B::C.class)
 end
 
 assert('Class Nested 6') do
   class A; end
   class A::B; end
   class A::B::C; end
-  assert_equal(A::B::C.new.class, A::B::C)
+  assert_equal(A::B::C, A::B::C.new.class)
 end
 
 assert('Class Nested 7') do
@@ -189,13 +189,13 @@ assert('Class Nested 8') do
   class A; end
   class A::B; end
   class A::B2 < A::B; end
-  assert_equal(A::B2.class, Class)
+  assert_equal(Class, A::B2.class)
 end
 
 assert('Class Colon 1') do
   class A; end
   A::C = 1
-  assert_equal(A::C, 1)
+  assert_equal(1, A::C)
 end
 
 assert('Class Colon 2') do
@@ -205,15 +205,15 @@ end
 
 assert('Class Colon 3') do
   class A; class ::C; end end
-  assert_equal(C.class, Class)
+  assert_equal(Class, C.class)
 end
 
 assert('Class Dup 1') do
   class C; end
-  assert_equal(C.dup.class, Class)
+  assert_equal(Class, C.dup.class)
 end
 
 assert('Class Dup 2') do
   module M; end
-  assert_equal(M.dup.class, Module)
+  assert_equal(Module, M.dup.class)
 end
diff --git a/test/t/enumerable.rb b/test/t/enumerable.rb
index 494490a9f..ed062823c 100644
--- a/test/t/enumerable.rb
+++ b/test/t/enumerable.rb
@@ -2,7 +2,7 @@
 # Enumerable ISO Test
 
 assert('Enumerable', '15.3.2') do
-  assert_equal(Enumerable.class, Module)
+  assert_equal(Module, Enumerable.class)
 end
 
 assert('Enumerable#all?', '15.3.2.2.1') do
@@ -21,7 +21,7 @@ end
 
 assert('Enumerable#detect', '15.3.2.2.4') do
   assert_true [1,2,3].detect() { true }
-  assert_equal [1,2,3].detect("a") { false }, 'a'
+  assert_equal 'a', [1,2,3].detect("a") { false }
 end
 
 assert('Array#each_with_index', '15.3.2.2.5') do
@@ -30,17 +30,17 @@ assert('Array#each_with_index', '15.3.2.2.5') do
 
   [1].each_with_index {|e,i| a = e; b = i}
 
-  assert_equal(a, 1)
-  assert_equal(b, 0)
+  assert_equal(1, a)
+  assert_equal(0, b)
 end
 
 assert('Enumerable#entries', '15.3.2.2.6') do
-  assert_equal([1].entries, [1])
+  assert_equal([1], [1].entries)
 end
 
 assert('Enumerable#find', '15.3.2.2.7') do
   assert_true [1,2,3].find() { true }
-  assert_equal [1,2,3].find("a") { false }, 'a'
+  assert_equal 'a', [1,2,3].find("a") { false }
 end
 
 assert('Enumerable#find_all', '15.3.2.2.8') do
@@ -48,7 +48,7 @@ assert('Enumerable#find_all', '15.3.2.2.8') do
 end
 
 assert('Enumerable#grep', '15.3.2.2.9') do
-  assert_equal [1,2,3,4,5,6,7,8,9].grep(4..6), [4,5,6]
+  assert_equal [4,5,6], [1,2,3,4,5,6,7,8,9].grep(4..6)
 end
 
 assert('Enumerable#include?', '15.3.2.2.10') do
@@ -57,24 +57,24 @@ assert('Enumerable#include?', '15.3.2.2.10') do
 end
 
 assert('Enumerable#inject', '15.3.2.2.11') do
-  assert_equal [1,2,3,4,5,6].inject() {|s, n| s + n}, 21
-  assert_equal [1,2,3,4,5,6].inject(1) {|s, n| s + n}, 22
+  assert_equal 21, [1,2,3,4,5,6].inject() {|s, n| s + n}
+  assert_equal 22, [1,2,3,4,5,6].inject(1) {|s, n| s + n}
 end
 
 assert('Enumerable#map', '15.3.2.2.12') do
-  assert_equal [1,2,3].map { |i| i + i }, [2,4,6]
+  assert_equal [2,4,6], [1,2,3].map { |i| i + i }
 end
 
 assert('Enumerable#max', '15.3.2.2.13') do
   a = ['aaa', 'bb', 'c']
-  assert_equal a.max, 'c'
-  assert_equal a.max {|i1,i2| i1.length <=> i2.length}, 'aaa'
+  assert_equal 'c', a.max
+  assert_equal 'aaa', a.max {|i1,i2| i1.length <=> i2.length}
 end
 
 assert('Enumerable#min', '15.3.2.2.14') do
   a = ['aaa', 'bb', 'c']
-  assert_equal a.min, 'aaa'
-  assert_equal a.min {|i1,i2| i1.length <=> i2.length}, 'c'
+  assert_equal 'aaa', a.min
+  assert_equal 'c', a.min {|i1,i2| i1.length <=> i2.length}
 end
 
 assert('Enumerable#member?', '15.3.2.2.15') do
@@ -95,14 +95,14 @@ assert('Enumerable#reject', '15.3.2.2.17') do
 end
 
 assert('Enumerable#select', '15.3.2.2.18') do
-  assert_equal [1,2,3,4,5,6,7,8,9].select() {|i| i%2 == 0}, [2,4,6,8]
+  assert_equal [2,4,6,8], [1,2,3,4,5,6,7,8,9].select() {|i| i%2 == 0}
 end
 
 assert('Enumerable#sort', '15.3.2.2.19') do
-  assert_equal [7,3,1,2,6,4].sort, [1,2,3,4,6,7]
-  assert_equal [7,3,1,2,6,4].sort {|e1,e2|e2<=>e1}, [7,6,4,3,2,1]
+  assert_equal [1,2,3,4,6,7], [7,3,1,2,6,4].sort
+  assert_equal [7,6,4,3,2,1], [7,3,1,2,6,4].sort {|e1,e2|e2<=>e1}
 end
 
 assert('Enumerable#to_a', '15.3.2.2.20') do
-  assert_equal [1].to_a, [1]
+  assert_equal [1], [1].to_a
 end
diff --git a/test/t/exception.rb b/test/t/exception.rb
index 4b4a7c31d..96b369e93 100644
--- a/test/t/exception.rb
+++ b/test/t/exception.rb
@@ -2,44 +2,44 @@
 # Exception ISO Test
 
 assert('Exception', '15.2.22') do
-  assert_equal Exception.class, Class
+  assert_equal Class, Exception.class
 end
 
 assert('Exception superclass', '15.2.22.2') do
-  assert_equal Exception.superclass, Object
+  assert_equal Object, Exception.superclass
 end
 
 assert('Exception.exception', '15.2.22.4.1') do
   e = Exception.exception('a')
 
-  assert_equal e.class, Exception
+  assert_equal Exception, e.class
 end
 
 assert('Exception#exception', '15.2.22.5.1') do
   e1 = Exception.exception()
   e2 = Exception.exception('b')
 
-  assert_equal e1.class, Exception
-  assert_equal e2.class, Exception
+  assert_equal Exception, e1.class
+  assert_equal Exception, e2.class
 end
 
 assert('Exception#message', '15.2.22.5.2') do
   e = Exception.exception('a')
 
-  assert_equal e.message, 'a'
+  assert_equal 'a', e.message
 end
 
 assert('Exception#to_s', '15.2.22.5.3') do
   e = Exception.exception('a')
 
-  assert_equal e.to_s, 'a'
+  assert_equal 'a', e.to_s
 end
 
 assert('Exception.exception', '15.2.22.4.1') do
   e = Exception.exception()
   e.initialize('a')
 
-  assert_equal e.message, 'a'
+  assert_equal 'a', e.message
 end
 
 assert('ScriptError', '15.2.37') do
@@ -103,7 +103,7 @@ assert('Exception 4') do
     end
     a = err.class
   }
-  assert_equal a, NilClass
+  assert_equal NilClass, a
 end
 
 assert('Exception 5') do
@@ -121,7 +121,7 @@ assert('Exception 5') do
     }
   end
   m2
-  assert_equal $ans, [nil]
+  assert_equal [nil], $ans
 end
 
 assert('Exception 6') do
@@ -147,7 +147,7 @@ assert('Exception 6') do
     yield
   end
   m
-  assert_equal $i, 7
+  assert_equal 7, $i
 end
 
 assert('Exception 7') do
@@ -167,7 +167,7 @@ assert('Exception 7') do
     p :end
   end
   m
-  assert_equal $i, 10
+  assert_equal 10, $i
 end
 
 assert('Exception 8') do
@@ -221,7 +221,7 @@ assert('Exception 11') do
     end
   rescue Exception
   end
-  assert_equal a, :ok
+  assert_equal :ok, a
 end
 
 assert('Exception 12') do
@@ -230,7 +230,7 @@ assert('Exception 12') do
     raise Exception rescue a = :ng
   rescue Exception
   end
-  assert_equal a, :ok
+  assert_equal :ok, a
 end
 
 assert('Exception 13') do
@@ -244,7 +244,7 @@ assert('Exception 13') do
   else
     a = :ng
   end
-  assert_equal a, :ok
+  assert_equal :ok, a
 end
 
 assert('Exception 14') do
@@ -256,7 +256,7 @@ assert('Exception 14') do
     a = :ok
   end
 
-  assert_equal a, :ok
+  assert_equal :ok, a
 end
 
 assert('Exception 15') do
@@ -265,7 +265,7 @@ assert('Exception 15') do
       rescue
         :ko
       end
-  assert_equal a, :ok
+  assert_equal :ok, a
 end
 
 assert('Exception 16') do
@@ -316,7 +316,7 @@ assert('Exception 19') do
       end
       [ r, @e ]
     end
-  
+
     def b
       begin
         1 * "b"
@@ -324,12 +324,12 @@ assert('Exception 19') do
         @e = self.z
       end
     end
-  
+
     def z
       true
     end
   end
-  assert_equal Class4Exception19.new.a, [true,  true]
+  assert_equal [true, true], Class4Exception19.new.a
 end
 
 assert('Exception#inspect without message') do
diff --git a/test/t/false.rb b/test/t/false.rb
index 97a3b8780..dbef985e5 100644
--- a/test/t/false.rb
+++ b/test/t/false.rb
@@ -2,11 +2,11 @@
 # FalseClass ISO Test
 
 assert('FalseClass', '15.2.6') do
-  assert_equal FalseClass.class, Class
+  assert_equal Class, FalseClass.class
 end
 
 assert('FalseClass superclass', '15.2.6.2') do
-  assert_equal FalseClass.superclass, Object
+  assert_equal Object, FalseClass.superclass
 end
 
 assert('FalseClass false', '15.2.6.1') do
@@ -24,7 +24,7 @@ assert('FalseClass#^', '15.2.6.3.2') do
 end
 
 assert('FalseClass#to_s', '15.2.6.3.3') do
-  assert_equal false.to_s, 'false'
+  assert_equal 'false', false.to_s
 end
 
 assert('FalseClass#|', '15.2.6.3.4') do
diff --git a/test/t/float.rb b/test/t/float.rb
index 97399b76f..f70bf2d66 100644
--- a/test/t/float.rb
+++ b/test/t/float.rb
@@ -2,51 +2,51 @@
 # Float ISO Test
 
 assert('Float', '15.2.9') do
-  assert_equal Float.class, Class
+  assert_equal Class, Float.class
 end
 
 assert('Float superclass', '15.2.9.2') do
-  assert_equal Float.superclass, Numeric
+  assert_equal Numeric, Float.superclass
 end
 
 assert('Float#+', '15.2.9.3.1') do
   a = 3.123456788 + 0.000000001
   b = 3.123456789 + 1
 
-  assert_float(a, 3.123456789)
-  assert_float(b, 4.123456789)
+  assert_float(3.123456789, a)
+  assert_float(4.123456789, b)
 end
 
 assert('Float#-', '15.2.9.3.2') do
   a = 3.123456790 - 0.000000001
   b = 5.123456789 - 1
 
-  assert_float(a, 3.123456789)
-  assert_float(b, 4.123456789)
+  assert_float(3.123456789, a)
+  assert_float(4.123456789, b)
 end
 
 assert('Float#*', '15.2.9.3.3') do
   a = 3.125 * 3.125
   b = 3.125 * 1
 
-  assert_float(a, 9.765625)
-  assert_float(b, 3.125)
+  assert_float(9.765625, a)
+  assert_float(3.125   , b)
 end
 
 assert('Float#/', '15.2.9.3.4') do
   a = 3.123456789 / 3.123456789
   b = 3.123456789 / 1
 
-  assert_float(a, 1.0)
-  assert_float(b, 3.123456789)
+  assert_float(1.0        , a)
+  assert_float(3.123456789, b)
 end
 
 assert('Float#%', '15.2.9.3.5') do
   a = 3.125 % 3.125
   b = 3.125 % 1
 
-  assert_float(a, 0.0)
-  assert_float(b, 0.125)
+  assert_float(0.0  , a)
+  assert_float(0.125, b)
 end
 
 assert('Float#<=>', '15.2.9.3.6') do
@@ -56,11 +56,11 @@ assert('Float#<=>', '15.2.9.3.6') do
   a2 = 3.125 <=> 3
   c2 = 3.125 <=> 4
 
-  assert_equal a, 1
-  assert_equal b, 0
-  assert_equal c, -1
-  assert_equal a2, 1
-  assert_equal c2, -1
+  assert_equal( 1, a)
+  assert_equal( 0, b)
+  assert_equal(-1, c)
+  assert_equal( 1, a2)
+  assert_equal(-1, c2)
 end
 
 assert('Float#==', '15.2.9.3.7') do
@@ -74,10 +74,10 @@ assert('Float#ceil', '15.2.9.3.8') do
   c = -3.123456789.ceil
   d = -3.0.ceil
 
-  assert_equal a, 4
-  assert_equal b, 3
-  assert_equal c, -3
-  assert_equal d, -3
+  assert_equal( 4, a)
+  assert_equal( 3, b)
+  assert_equal(-3, c)
+  assert_equal(-3, d)
 end
 
 assert('Float#finite?', '15.2.9.3.9') do
@@ -91,10 +91,10 @@ assert('Float#floor', '15.2.9.3.10') do
   c = -3.123456789.floor
   d = -3.0.floor
 
-  assert_equal a, 3
-  assert_equal b, 3
-  assert_equal c, -4
-  assert_equal d, -3
+  assert_equal( 3, a)
+  assert_equal( 3, b)
+  assert_equal(-4, c)
+  assert_equal(-3, d)
 end
 
 assert('Float#infinite?', '15.2.9.3.11') do
@@ -103,8 +103,8 @@ assert('Float#infinite?', '15.2.9.3.11') do
   c = (-1.0 / 0.0).infinite?
 
   assert_nil a
-  assert_equal b, 1
-  assert_equal c, -1
+  assert_equal( 1, b)
+  assert_equal(-1, c)
 end
 
 assert('Float#round', '15.2.9.3.12') do
@@ -118,28 +118,28 @@ assert('Float#round', '15.2.9.3.12') do
   h = 3.423456789.round(1)
   i = 3.423456789.round(3)
 
-  assert_equal a, 3
-  assert_equal b, 4
-  assert_equal c, 3
-  assert_equal d, -3
-  assert_equal e, -4
-  assert_equal f, 12350
-  assert_equal g, 3
-  assert_float(h, 3.4)
-  assert_float(i, 3.423)
+  assert_equal(    3, a)
+  assert_equal(    4, b)
+  assert_equal(    3, c)
+  assert_equal(   -3, d)
+  assert_equal(   -4, e)
+  assert_equal(12350, f)
+  assert_equal(    3, g)
+  assert_float(  3.4, h)
+  assert_float(3.423, i)
 end
 
 assert('Float#to_f', '15.2.9.3.13') do
   a = 3.123456789
 
-  assert_float(a.to_f, a)
+  assert_float(a, a.to_f)
 end
 
 assert('Float#to_i', '15.2.9.3.14') do
-  assert_equal 3.123456789.to_i, 3
+  assert_equal(3, 3.123456789.to_i)
 end
 
 assert('Float#truncate', '15.2.9.3.15') do
-  assert_equal 3.123456789.truncate, 3
-  assert_equal(-3.1.truncate, -3)
+  assert_equal( 3,  3.123456789.truncate)
+  assert_equal(-3, -3.1.truncate)
 end
diff --git a/test/t/gc.rb b/test/t/gc.rb
index 4a1bd0c1a..4b800e945 100644
--- a/test/t/gc.rb
+++ b/test/t/gc.rb
@@ -1,15 +1,15 @@
 # Not ISO specified
 
 assert('GC.enable') do
-  assert_equal GC.disable, false
-  assert_equal GC.enable, true
-  assert_equal GC.enable, false
+  assert_false GC.disable
+  assert_true GC.enable
+  assert_false GC.enable
 end
 
 assert('GC.disable') do
   begin
-    assert_equal GC.disable, false
-    assert_equal GC.disable, true
+    assert_false GC.disable
+    assert_true GC.disable
   ensure
     GC.enable
   end
@@ -18,7 +18,7 @@ end
 assert('GC.interval_ratio=') do
   origin = GC.interval_ratio
   begin
-    assert_equal (GC.interval_ratio = 150), 150
+    assert_equal 150, (GC.interval_ratio = 150)
   ensure
     GC.interval_ratio = origin
   end
@@ -27,7 +27,7 @@ end
 assert('GC.step_ratio=') do
   origin = GC.step_ratio
   begin
-    assert_equal (GC.step_ratio = 150), 150
+    assert_equal 150, (GC.step_ratio = 150)
   ensure
     GC.step_ratio = origin
   end
@@ -36,9 +36,9 @@ end
 assert('GC.generational_mode=') do
   origin = GC.generational_mode
   begin
-    assert_equal (GC.generational_mode = false), false
-    assert_equal (GC.generational_mode = true), true
-    assert_equal (GC.generational_mode = true), true
+    assert_false (GC.generational_mode = false)
+    assert_true (GC.generational_mode = true)
+    assert_true (GC.generational_mode = true)
   ensure
     GC.generational_mode = origin
   end
diff --git a/test/t/hash.rb b/test/t/hash.rb
index 6f05b25ac..39f9ae9d8 100644
--- a/test/t/hash.rb
+++ b/test/t/hash.rb
@@ -2,11 +2,11 @@
 # Hash ISO Test
 
 assert('Hash', '15.2.13') do
-  assert_equal Hash.class, Class
+  assert_equal Class, Hash.class
 end
 
 assert('Hash superclass', '15.2.13.2') do
-  assert_equal Hash.superclass, Object
+  assert_equal Object, Hash.superclass
 end
 
 assert('Hash#==', '15.2.13.4.1') do
@@ -17,21 +17,21 @@ end
 assert('Hash#[]', '15.2.13.4.2') do
   a = { 'abc' => 'abc' }
 
-  assert_equal a['abc'], 'abc'
+  assert_equal 'abc', a['abc']
 end
 
 assert('Hash#[]=', '15.2.13.4.3') do
   a = Hash.new
   a['abc'] = 'abc'
 
-  assert_equal a['abc'], 'abc'
+  assert_equal 'abc', a['abc']
 end
 
 assert('Hash#clear', '15.2.13.4.4') do
   a = { 'abc' => 'abc' }
   a.clear
 
-  assert_equal a, { }
+  assert_equal({ }, a)
 end
 
 assert('Hash#default', '15.2.13.4.5') do
@@ -40,17 +40,17 @@ assert('Hash#default', '15.2.13.4.5') do
   c = Hash.new {|s,k| s[k] = k}
 
   assert_nil a.default
-  assert_equal b.default, 'abc'
+  assert_equal 'abc', b.default
   assert_nil c.default
-  assert_equal c.default('abc'), 'abc'
+  assert_equal 'abc', c.default('abc')
 end
 
 assert('Hash#default=', '15.2.13.4.6') do
   a = { 'abc' => 'abc' }
   a.default = 'cba'
 
-  assert_equal a['abc'], 'abc'
-  assert_equal a['notexist'], 'cba'
+  assert_equal 'abc', a['abc']
+  assert_equal 'cba', a['notexist']
 end
 
 assert('Hash#default_proc', '15.2.13.4.7') do
@@ -60,9 +60,9 @@ assert('Hash#default_proc', '15.2.13.4.7') do
   d = b['cat']
 
   assert_nil a.default_proc
-  assert_equal b.default_proc.class, Proc
-  assert_equal c, 4
-  assert_equal d, 'catcat'
+  assert_equal Proc, b.default_proc.class
+  assert_equal 4, c
+  assert_equal 'catcat', d
 end
 
 assert('Hash#delete', '15.2.13.4.8') do
@@ -95,8 +95,8 @@ assert('Hash#each', '15.2.13.4.9') do
     value = v
   end
 
-  assert_equal key, 'abc_key'
-  assert_equal value, 'abc_value'
+  assert_equal 'abc_key', key
+  assert_equal 'abc_value', value
 end
 
 assert('Hash#each_key', '15.2.13.4.10') do
@@ -107,7 +107,7 @@ assert('Hash#each_key', '15.2.13.4.10') do
     key = k
   end
 
-  assert_equal key, 'abc_key'
+  assert_equal 'abc_key', key
 end
 
 assert('Hash#each_value', '15.2.13.4.11') do
@@ -118,7 +118,7 @@ assert('Hash#each_value', '15.2.13.4.11') do
     value = v
   end
 
-  assert_equal value, 'abc_value'
+  assert_equal 'abc_value', value
 end
 
 assert('Hash#empty?', '15.2.13.4.12') do
@@ -159,16 +159,16 @@ assert('Hash#initialize', '15.2.13.4.16') do
   h2 = Hash.new(:not_found)
 
   assert_true h.is_a? Hash
-  assert_equal h, { }
+  assert_equal({ }, h)
   assert_nil h["hello"]
-  assert_equal h2["hello"], :not_found
+  assert_equal :not_found, h2["hello"]
 end
 
 assert('Hash#initialize_copy', '15.2.13.4.17') do
   a = { 'abc_key' => 'abc_value' }
   b = Hash.new.initialize_copy(a)
 
-  assert_equal b, { 'abc_key' => 'abc_value' }
+  assert_equal({ 'abc_key' => 'abc_value' }, b)
 end
 
 assert('Hash#key?', '15.2.13.4.18') do
@@ -182,15 +182,15 @@ end
 assert('Hash#keys', '15.2.13.4.19') do
   a = { 'abc_key' => 'abc_value' }
 
-  assert_equal a.keys, ['abc_key']
+  assert_equal ['abc_key'], a.keys
 end
 
 assert('Hash#length', '15.2.13.4.20') do
   a = { 'abc_key' => 'abc_value' }
   b = Hash.new
 
-  assert_equal a.length, 1
-  assert_equal b.length, 0
+  assert_equal 1, a.length
+  assert_equal 0, b.length
 end
 
 assert('Hash#member?', '15.2.13.4.21') do
@@ -210,40 +210,40 @@ assert('Hash#merge', '15.2.13.4.22') do
     original
   end
 
-  assert_equal result_1, {'abc_key' => 'abc_value', 'cba_key' => 'XXX',
-               'xyz_key' => 'xyz_value' }
-  assert_equal result_2, {'abc_key' => 'abc_value', 'cba_key' => 'cba_value',
-               'xyz_key' => 'xyz_value' }
+  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'XXX',
+                'xyz_key' => 'xyz_value' }, result_1)
+  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'cba_value',
+                'xyz_key' => 'xyz_value' }, result_2)
 end
 
 assert('Hash#replace', '15.2.13.4.23') do
   a = { 'abc_key' => 'abc_value' }
   b = Hash.new.replace(a)
 
-  assert_equal b, { 'abc_key' => 'abc_value' }
+  assert_equal({ 'abc_key' => 'abc_value' }, b)
 end
 
 assert('Hash#shift', '15.2.13.4.24') do
   a = { 'abc_key' => 'abc_value', 'cba_key' => 'cba_value' }
   b = a.shift
 
-  assert_equal a, { 'abc_key' => 'abc_value' }
-  assert_equal b, [ 'cba_key', 'cba_value' ]
+  assert_equal({ 'abc_key' => 'abc_value' }, a)
+  assert_equal [ 'cba_key', 'cba_value' ], b
 end
 
 assert('Hash#size', '15.2.13.4.25') do
   a = { 'abc_key' => 'abc_value' }
   b = Hash.new
 
-  assert_equal a.size, 1
-  assert_equal b.size, 0
+  assert_equal 1, a.size
+  assert_equal 0, b.size
 end
 
 assert('Hash#store', '15.2.13.4.26') do
   a = Hash.new
   a.store('abc', 'abc')
 
-  assert_equal a['abc'], 'abc'
+  assert_equal 'abc', a['abc']
 end
 
 assert('Hash#value?', '15.2.13.4.27') do
@@ -257,7 +257,7 @@ end
 assert('Hash#values', '15.2.13.4.28') do
   a = { 'abc_key' => 'abc_value' }
 
-  assert_equal a.values, ['abc_value']
+  assert_equal ['abc_value'], a.values
 end
 
 # Not ISO specified
@@ -267,8 +267,8 @@ assert('Hash#reject') do
   ret = h.reject do |k,v|
     v % 2 == 0
   end
-  assert_equal ret, {:one => 1, :three => 3}
-  assert_equal h, {:one => 1, :two => 2, :three => 3, :four => 4}
+  assert_equal({:one => 1, :three => 3}, ret)
+  assert_equal({:one => 1, :two => 2, :three => 3, :four => 4}, h)
 end
 
 assert('Hash#reject!') do
@@ -276,8 +276,8 @@ assert('Hash#reject!') do
   ret = h.reject! do |k,v|
     v % 2 == 0
   end
-  assert_equal ret, {:one => 1, :three => 3}
-  assert_equal h, {:one => 1, :three => 3}
+  assert_equal({:one => 1, :three => 3}, ret)
+  assert_equal({:one => 1, :three => 3}, h)
 end
 
 assert('Hash#select') do
@@ -285,8 +285,8 @@ assert('Hash#select') do
   ret = h.select do |k,v|
     v % 2 == 0
   end
-  assert_equal ret, {:two => 2, :four => 4}
-  assert_equal h, {:one => 1, :two => 2, :three => 3, :four => 4}
+  assert_equal({:two => 2, :four => 4}, ret)
+  assert_equal({:one => 1, :two => 2, :three => 3, :four => 4}, h)
 end
 
 assert('Hash#select!') do
@@ -294,8 +294,8 @@ assert('Hash#select!') do
   ret = h.select! do |k,v|
     v % 2 == 0
   end
-  assert_equal ret, {:two => 2, :four => 4}
-  assert_equal h, {:two => 2, :four => 4}
+  assert_equal({:two => 2, :four => 4}, ret)
+  assert_equal({:two => 2, :four => 4}, h)
 end
 
 # Not ISO specified
diff --git a/test/t/indexerror.rb b/test/t/indexerror.rb
index b71766c95..ea008a227 100644
--- a/test/t/indexerror.rb
+++ b/test/t/indexerror.rb
@@ -2,9 +2,9 @@
 # IndexError ISO Test
 
 assert('IndexError', '15.2.33') do
-  assert_equal IndexError.class, Class
+  assert_equal Class, IndexError.class
 end
 
 assert('IndexError superclass', '15.2.33.2') do
-  assert_equal IndexError.superclass, StandardError
+  assert_equal StandardError, IndexError.superclass
 end
diff --git a/test/t/integer.rb b/test/t/integer.rb
index 9b19216d9..79ee1e790 100644
--- a/test/t/integer.rb
+++ b/test/t/integer.rb
@@ -2,43 +2,43 @@
 # Integer ISO Test
 
 assert('Integer', '15.2.8') do
-  assert_equal Integer.class, Class
+  assert_equal Class, Integer.class
 end
 
 assert('Integer superclass', '15.2.8.2') do
-  assert_equal Integer.superclass, Numeric
+  assert_equal Numeric, Integer.superclass
 end
 
 assert('Integer#+', '15.2.8.3.1') do
   a = 1+1
   b = 1+1.0
 
-  assert_equal a, 2
-  assert_equal b, 2.0
+  assert_equal 2, a
+  assert_equal 2.0, b
 end
 
 assert('Integer#-', '15.2.8.3.2') do
   a = 2-1
   b = 2-1.0
 
-  assert_equal a, 1
-  assert_equal b, 1.0
+  assert_equal 1, a
+  assert_equal 1.0, b
 end
 
 assert('Integer#*', '15.2.8.3.3') do
   a = 1*1
   b = 1*1.0
 
-  assert_equal a, 1
-  assert_equal b, 1.0
+  assert_equal 1, a
+  assert_equal 1.0, b
 end
 
 assert('Integer#/', '15.2.8.3.4') do
   a = 2/1
   b = 2/1.0
 
-  assert_equal a, 2
-  assert_equal b, 2.0
+  assert_equal 2, a
+  assert_equal 2.0, b
 end
 
 assert('Integer#%', '15.2.8.3.5') do
@@ -46,9 +46,9 @@ assert('Integer#%', '15.2.8.3.5') do
   b = 1%1.0
   c = 2%4
 
-  assert_equal a, 0
-  assert_equal b, 0.0
-  assert_equal c, 2
+  assert_equal 0, a
+  assert_equal 0.0, b
+  assert_equal 2, c
 end
 
 assert('Integer#<=>', '15.2.8.3.6') do
@@ -56,9 +56,9 @@ assert('Integer#<=>', '15.2.8.3.6') do
   b = 1<=>1
   c = 1<=>2
 
-  assert_equal a, 1
-  assert_equal b, 0
-  assert_equal c, -1
+  assert_equal  1, a
+  assert_equal  0, b
+  assert_equal(-1, c)
 end
 
 assert('Integer#==', '15.2.8.3.7') do
@@ -71,8 +71,8 @@ end
 
 assert('Integer#~', '15.2.8.3.8') do
   # Complement
-  assert_equal ~0, -1
-  assert_equal ~2, -3
+  assert_equal(-1, ~0)
+  assert_equal(-3, ~2)
 end
 
 assert('Integer#&', '15.2.8.3.9') do
@@ -80,7 +80,7 @@ assert('Integer#&', '15.2.8.3.9') do
   #   0101 (5)
   # & 0011 (3)
   # = 0001 (1)
-  assert_equal 5 & 3, 1
+  assert_equal 1, 5 & 3
 end
 
 assert('Integer#|', '15.2.8.3.10') do
@@ -88,7 +88,7 @@ assert('Integer#|', '15.2.8.3.10') do
   #   0101 (5)
   # | 0011 (3)
   # = 0111 (7)
-  assert_equal 5 | 3, 7
+  assert_equal 7, 5 | 3
 end
 
 assert('Integer#^', '15.2.8.3.11') do
@@ -96,17 +96,17 @@ assert('Integer#^', '15.2.8.3.11') do
   #   0101 (5)
   # ^ 0011 (3)
   # = 0110 (6)
-  assert_equal 5 ^ 3, 6
+  assert_equal 6, 5 ^ 3
 end
 
 assert('Integer#<<', '15.2.8.3.12') do
   # Left Shift by one
   #   00010111 (23)
   # = 00101110 (46)
-  assert_equal 23 << 1, 46
+  assert_equal 46, 23 << 1
 
   # Left Shift by a negative is Right Shift
-  assert_equal 46 << -1, 23
+  assert_equal 23, 46 << -1
 
   # Raise when shift is too large
   assert_raise(RangeError) do
@@ -118,13 +118,13 @@ assert('Integer#>>', '15.2.8.3.13') do
   # Right Shift by one
   #   00101110 (46)
   # = 00010111 (23)
-  assert_equal 46 >> 1, 23
+  assert_equal 23, 46 >> 1
 
   # Right Shift by a negative is Left Shift
-  assert_equal 23 >> -1, 46
+  assert_equal 46, 23 >> -1
 
   # Don't raise on large Right Shift
-  assert_equal 23 >> 128, 0
+  assert_equal 0, 23 >> 128
 
   # Raise when shift is too large
   assert_raise(RangeError) do
@@ -133,7 +133,7 @@ assert('Integer#>>', '15.2.8.3.13') do
 end
 
 assert('Integer#ceil', '15.2.8.3.14') do
-  assert_equal 10.ceil, 10
+  assert_equal 10, 10.ceil
 end
 
 assert('Integer#downto', '15.2.8.3.15') do
@@ -141,7 +141,7 @@ assert('Integer#downto', '15.2.8.3.15') do
   3.downto(1) do |i|
     a += i
   end
-  assert_equal a, 6
+  assert_equal 6, a
 end
 
 assert('Integer#eql?', '15.2.8.3.16') do
@@ -157,19 +157,19 @@ end
 assert('Integer#floor', '15.2.8.3.17') do
   a = 1.floor
 
-  assert_equal a, 1
+  assert_equal 1, a
 end
 
 assert('Integer#next', '15.2.8.3.19') do
-  assert_equal 1.next, 2
+  assert_equal 2, 1.next
 end
 
 assert('Integer#round', '15.2.8.3.20') do
-  assert_equal 1.round, 1
+  assert_equal 1, 1.round
 end
 
 assert('Integer#succ', '15.2.8.3.21') do
-  assert_equal 1.succ, 2
+  assert_equal 2, 1.succ
 end
 
 assert('Integer#times', '15.2.8.3.22') do
@@ -177,24 +177,24 @@ assert('Integer#times', '15.2.8.3.22') do
   3.times do
     a += 1
   end
-  assert_equal a, 3
+  assert_equal 3, a
 end
 
 assert('Integer#to_f', '15.2.8.3.23') do
-  assert_equal 1.to_f, 1.0
+  assert_equal 1.0, 1.to_f
 end
 
 assert('Integer#to_i', '15.2.8.3.24') do
-  assert_equal 1.to_i, 1
+  assert_equal 1, 1.to_i
 end
 
 assert('Integer#to_s', '15.2.8.3.25') do
-  assert_equal 1.to_s, '1'
-  assert_equal(-1.to_s, "-1")
+  assert_equal '1', 1.to_s
+  assert_equal("-1", -1.to_s)
 end
 
 assert('Integer#truncate', '15.2.8.3.26') do
-  assert_equal 1.truncate, 1
+  assert_equal 1, 1.truncate
 end
 
 assert('Integer#upto', '15.2.8.3.27') do
@@ -202,7 +202,7 @@ assert('Integer#upto', '15.2.8.3.27') do
   1.upto(3) do |i|
     a += i
   end
-  assert_equal a, 6
+  assert_equal 6, a
 end
 
 # Not ISO specified
@@ -217,6 +217,6 @@ assert('Integer#step') do
     b << i
   end
 
-  assert_equal a, [1, 2, 3]
-  assert_equal b, [1, 3, 5]
+  assert_equal [1, 2, 3], a
+  assert_equal [1, 3, 5], b
 end
diff --git a/test/t/kernel.rb b/test/t/kernel.rb
index f92fa3b8a..81c111053 100644
--- a/test/t/kernel.rb
+++ b/test/t/kernel.rb
@@ -2,7 +2,7 @@
 # Kernel ISO Test
 
 assert('Kernel', '15.3.1') do
-  assert_equal Kernel.class, Module
+  assert_equal Module, Kernel.class
 end
 
 assert('Kernel.block_given?', '15.3.1.2.2') do
@@ -16,7 +16,7 @@ assert('Kernel.block_given?', '15.3.1.2.2') do
 
   assert_false Kernel.block_given?
   # test without block
-  assert_equal bg_try, "no block"
+  assert_equal "no block", bg_try
   # test with block
   assert_equal "block" do
     bg_try { "block" }
@@ -32,7 +32,7 @@ end
 # Kernel.eval is provided by the mruby-gem mrbgem. '15.3.1.2.3'
 
 assert('Kernel.global_variables', '15.3.1.2.4') do
-  assert_equal Kernel.global_variables.class, Array
+  assert_equal Array, Kernel.global_variables.class
 end
 
 assert('Kernel.iterator?', '15.3.1.2.5') do
@@ -47,9 +47,9 @@ assert('Kernel.lambda', '15.3.1.2.6') do
   m = Kernel.lambda(&l)
 
   assert_true l.call
-  assert_equal l.class, Proc
+  assert_equal Proc, l.class
   assert_true m.call
-  assert_equal m.class, Proc
+  assert_equal Proc, m.class
 end
 
 # Not implemented at the moment
@@ -65,7 +65,7 @@ assert('Kernel.loop', '15.3.1.2.8') do
     break if i == 100
   end
 
-  assert_equal i, 100
+  assert_equal 100, i
 end
 
 assert('Kernel.p', '15.3.1.2.9') do
@@ -94,7 +94,7 @@ assert('Kernel.raise', '15.3.1.2.12') do
 end
 
 assert('Kernel#__id__', '15.3.1.3.3') do
-  assert_equal __id__.class, Fixnum
+  assert_equal Fixnum, __id__.class
 end
 
 assert('Kernel#__send__', '15.3.1.3.4') do
@@ -102,13 +102,13 @@ assert('Kernel#__send__', '15.3.1.3.4') do
   l = __send__(:lambda) do
     true
   end
- 
+
   assert_true l.call
-  assert_equal l.class, Proc
+  assert_equal Proc, l.class
   # test with argument
   assert_true __send__(:respond_to?, :nil?)
   # test without argument and without block
-  assert_equal __send__(:public_methods).class, Array
+  assert_equal  Array, __send__(:public_methods).class
 end
 
 assert('Kernel#block_given?', '15.3.1.3.6') do
@@ -121,7 +121,7 @@ assert('Kernel#block_given?', '15.3.1.3.6') do
   end
 
   assert_false block_given?
-  assert_equal bg_try, "no block"
+  assert_equal "no block", bg_try
   assert_equal "block" do
     bg_try { "block" }
   end
@@ -133,7 +133,7 @@ assert('Kernel#block_given?', '15.3.1.3.6') do
 end
 
 assert('Kernel#class', '15.3.1.3.7') do
-  assert_equal Kernel.class, Module
+  assert_equal Module, Kernel.class
 end
 
 assert('Kernel#clone', '15.3.1.3.8') do
@@ -170,9 +170,9 @@ assert('Kernel#clone', '15.3.1.3.8') do
     end
   end
 
-  assert_equal a.get, 2
-  assert_equal b.get, 1
-  assert_equal c.get, 2
+  assert_equal 2, a.get
+  assert_equal 1, b.get
+  assert_equal 2, c.get
   assert_true a.respond_to?(:test)
   assert_false b.respond_to?(:test)
   assert_true c.respond_to?(:test)
@@ -212,10 +212,10 @@ assert('Kernel#dup', '15.3.1.3.9') do
     end
   end
 
-  assert_equal error_count, immutables.size
-  assert_equal a.get, 2
-  assert_equal b.get, 1
-  assert_equal c.get, 2
+  assert_equal immutables.size, error_count
+  assert_equal 2, a.get
+  assert_equal 1, b.get
+  assert_equal 2, c.get
   assert_true a.respond_to?(:test)
   assert_false b.respond_to?(:test)
   assert_false c.respond_to?(:test)
@@ -243,14 +243,14 @@ assert('Kernel#extend works on toplevel', '15.3.1.3.13') do
   module Test4ExtendModule
     def test_method; end
   end
-  # This would crash... 
+  # This would crash...
   extend(Test4ExtendModule)
 
   assert_true respond_to?(:test_method)
 end
 
 assert('Kernel#global_variables', '15.3.1.3.14') do
-  assert_equal global_variables.class, Array
+  assert_equal Array, global_variables.class
 end
 
 assert('Kernel#hash', '15.3.1.3.15') do
@@ -260,8 +260,8 @@ end
 assert('Kernel#inspect', '15.3.1.3.17') do
   s = inspect
 
-  assert_equal s.class, String
-  assert_equal s, "main"
+  assert_equal String, s.class
+  assert_equal "main", s
 end
 
 assert('Kernel#instance_variables', '15.3.1.3.23') do
@@ -272,8 +272,8 @@ assert('Kernel#instance_variables', '15.3.1.3.23') do
   end
   ivars = o.instance_variables
 
-  assert_equal ivars.class, Array
-  assert_equal ivars.size, 2
+  assert_equal Array, ivars.class,
+  assert_equal(2, ivars.size)
   assert_true ivars.include?(:@a)
   assert_true ivars.include?(:@b)
 end
@@ -300,9 +300,9 @@ assert('Kernel#lambda', '15.3.1.3.27') do
   m = lambda(&l)
 
   assert_true l.call
-  assert_equal l.class, Proc
+  assert_equal Proc, l.class
   assert_true m.call
-  assert_equal m.class, Proc
+  assert_equal Proc, m.class
 end
 
 # Not implemented yet
@@ -322,7 +322,7 @@ assert('Kernel#loop', '15.3.1.3.29') do
 end
 
 assert('Kernel#methods', '15.3.1.3.31') do
-  assert_equal methods.class, Array
+  assert_equal Array, methods.class
 end
 
 assert('Kernel#nil?', '15.3.1.3.32') do
@@ -330,7 +330,7 @@ assert('Kernel#nil?', '15.3.1.3.32') do
 end
 
 assert('Kernel#object_id', '15.3.1.3.33') do
-  assert_equal object_id.class, Fixnum
+  assert_equal Fixnum, object_id.class
 end
 
 # Kernel#p is defined in mruby-print mrbgem. '15.3.1.3.34'
@@ -338,15 +338,15 @@ end
 # Kernel#print is defined in mruby-print mrbgem. '15.3.1.3.35'
 
 assert('Kernel#private_methods', '15.3.1.3.36') do
-  assert_equal private_methods.class, Array
+  assert_equal Array, private_methods.class
 end
 
 assert('Kernel#protected_methods', '15.3.1.3.37') do
-  assert_equal protected_methods.class, Array
+  assert_equal Array, protected_methods.class
 end
 
 assert('Kernel#public_methods', '15.3.1.3.38') do
-  assert_equal public_methods.class, Array
+  assert_equal Array, public_methods.class
 end
 
 # Kernel#puts is defined in mruby-print mrbgem. '15.3.1.3.39'
@@ -378,7 +378,7 @@ assert('Kernel#respond_to?', '15.3.1.3.43') do
   assert_true respond_to?(:nil?)
   assert_true Test4RespondTo.new.respond_to?(:valid_method)
   assert_true Test4RespondTo.new.respond_to?('valid_method')
-  assert_false Test4RespondTo.new.respond_to?(:test_method) 
+  assert_false Test4RespondTo.new.respond_to?(:test_method)
 end
 
 assert('Kernel#send', '15.3.1.3.44') do
diff --git a/test/t/literals.rb b/test/t/literals.rb
index c4fe9c993..524ceb440 100644
--- a/test/t/literals.rb
+++ b/test/t/literals.rb
@@ -10,29 +10,29 @@ assert('Literals Numerical', '8.7.6.2') do
   assert_equal 1.0, 1.0
   assert_equal(-1.0, -1.0)
   # binary
-  assert_equal 0b10000000, 128
-  assert_equal 0B10000000, 128
+  assert_equal 128, 0b10000000
+  assert_equal 128, 0B10000000
   # octal
-  assert_equal 0o10, 8
-  assert_equal 0O10, 8
-  assert_equal 0_10, 8
+  assert_equal 8, 0o10
+  assert_equal 8, 0O10
+  assert_equal 8, 0_10
   # hex
-  assert_equal 0xff, 255
-  assert_equal 0Xff, 255
+  assert_equal 255, 0xff
+  assert_equal 255, 0Xff
   # decimal
-  assert_equal 0d999, 999
-  assert_equal 0D999, 999
+  assert_equal 999, 0d999
+  assert_equal 999, 0D999
   # decimal seperator
-  assert_equal 10_000_000, 10000000
-  assert_equal 1_0, 10
+  assert_equal 10000000, 10_000_000
+  assert_equal       10, 1_0
   # integer with exponent
-  assert_equal 1e1, 10.0
-  assert_equal 1e-1, 0.1
-  assert_equal 1e+1, 10.0
+  assert_equal 10.0, 1e1,
+  assert_equal(0.1, 1e-1)
+  assert_equal 10.0, 1e+1
   # float with exponent
-  assert_equal 1.0e1, 10.0
-  assert_equal 1.0e-1, 0.1
-  assert_equal 1.0e+1, 10.0
+  assert_equal 10.0, 1.0e1
+  assert_equal(0.1, 1.0e-1)
+  assert_equal 10.0, 1.0e+1
 end
 
 assert('Literals Strings Single Quoted', '8.7.6.3.2') do
@@ -47,7 +47,7 @@ assert('Literals Strings Double Quoted', '8.7.6.3.3') do
   assert_equal "abc", "abc"
   assert_equal "\"", "\""
   assert_equal "\\", "\\"
-  assert_equal "#{a}", "abc"
+  assert_equal "abc", "#{a}"
 end
 
 assert('Literals Strings Quoted Non-Expanded', '8.7.6.3.4') do
@@ -59,13 +59,13 @@ assert('Literals Strings Quoted Non-Expanded', '8.7.6.3.4') do
   f = %q/ab\/c/
   g = %q{#{a}}
 
-  assert_equal a, 'abc'
-  assert_equal b, 'abc'
-  assert_equal c, 'abc'
-  assert_equal d, 'abc'
-  assert_equal e, 'abc'
-  assert_equal f, 'ab/c'
-  assert_equal g, '#{a}'
+  assert_equal 'abc', a
+  assert_equal 'abc', b
+  assert_equal 'abc', c
+  assert_equal 'abc', d
+  assert_equal 'abc', e
+  assert_equal 'ab/c', f
+  assert_equal '#{a}', g
 end
 
 assert('Literals Strings Quoted Expanded', '8.7.6.3.5') do
@@ -77,13 +77,13 @@ assert('Literals Strings Quoted Expanded', '8.7.6.3.5') do
   f = %Q/ab\/c/
   g = %Q{#{a}}
 
-  assert_equal a, 'abc'
-  assert_equal b, 'abc'
-  assert_equal c, 'abc'
-  assert_equal d, 'abc'
-  assert_equal e, 'abc'
-  assert_equal f, 'ab/c'
-  assert_equal g, 'abc'
+  assert_equal 'abc', a
+  assert_equal 'abc', b
+  assert_equal 'abc', c
+  assert_equal 'abc', d
+  assert_equal 'abc', e
+  assert_equal 'ab/c', f
+  assert_equal 'abc', g
 end
 
 assert('Literals Strings Here documents', '8.7.6.3.6') do
@@ -141,18 +141,18 @@ KKK
   z = <<'ZZZ'
 ZZZ
 
-  assert_equal a, "aaa\n"
-  assert_equal b, "bbb\n"
-  assert_equal c, ["c1\n", "c 2\n", "c  3\n"]
-  assert_equal d, "d3DDD\nd\t\nDDD\n\n"
-  assert_equal e, "e\#{1+2}EEE\ne\\t\nEEE\\n\n"
-  assert_equal f, "F\nFFfFFF\nF\n"
-  assert_equal g, "  ggg\n"
-  assert_equal h, "  hhh\n"
-  assert_equal i, "  iii\n"
-  assert_equal j, ["  j1j\n", "  j2j\n", "  j\#{3}j\n"]
-  assert_equal k, 123
-  assert_equal z, ""
+  assert_equal "aaa\n", a
+  assert_equal "bbb\n", b
+  assert_equal ["c1\n", "c 2\n", "c  3\n"], c
+  assert_equal "d3DDD\nd\t\nDDD\n\n", d
+  assert_equal "e\#{1+2}EEE\ne\\t\nEEE\\n\n", e
+  assert_equal "F\nFFfFFF\nF\n", f
+  assert_equal "  ggg\n", g
+  assert_equal "  hhh\n", h
+  assert_equal "  iii\n", i
+  assert_equal ["  j1j\n", "  j2j\n", "  j\#{3}j\n"], j
+  assert_equal 123, k
+  assert_equal "", z
 end
 
 assert('Literals Array', '8.7.6.4') do
@@ -173,14 +173,14 @@ assert('Literals Array', '8.7.6.4') do
 d
          x\y x\\y x\\\y)
 
-  assert_equal a, ['abc3def', '}g']
-  assert_equal b, ['abc', '5', 'def', '(g']
-  assert_equal c, ['7']
-  assert_equal d, ['9']
-  assert_equal e, []
-  assert_equal f, ['[ab', 'cd][ef]']
-  assert_equal g, ['ab', '-11', '22']
-  assert_equal h, ["a\nb", 'test abc', "c\nd", "xy", "x\\y", "x\\y"]
+  assert_equal ['abc3def', '}g'], a
+  assert_equal ['abc', '5', 'def', '(g'], b
+  assert_equal ['7'],c
+  assert_equal ['9'], d
+  assert_equal [], e
+  assert_equal ['[ab', 'cd][ef]'], f
+  assert_equal ['ab', '-11', '22'], g
+  assert_equal ["a\nb", 'test abc', "c\nd", "xy", "x\\y", "x\\y"], h
 
   a = %w{abc#{1+2}def \}g}
   b = %w(abc #{2+3} def \(g)
@@ -199,14 +199,14 @@ d
 d
          x\y x\\y x\\\y)
 
-  assert_equal a, ['abc#{1+2}def', '}g']
-  assert_equal b, ['abc', '#{2+3}', 'def', '(g']
-  assert_equal c, ['#{3+4}']
-  assert_equal d, ['#{4+5}']
-  assert_equal e, []
-  assert_equal f, ['[ab', 'cd][ef]']
-  assert_equal g, ['ab', '#{-1}1', '2#{2}']
-  assert_equal h, ["a\\nb", "test abc", "c\nd", "x\\y", "x\\y", "x\\\\y"]
+  assert_equal ['abc#{1+2}def', '}g'], a
+  assert_equal ['abc', '#{2+3}', 'def', '(g'], b
+  assert_equal ['#{3+4}'], c
+  assert_equal ['#{4+5}'], d
+  assert_equal [], e
+  assert_equal ['[ab', 'cd][ef]'], f
+  assert_equal ['ab', '#{-1}1', '2#{2}'], g
+  assert_equal ["a\\nb", "test abc", "c\nd", "x\\y", "x\\y", "x\\\\y"], h
 end
 
 assert('Literals Array of symbols') do
@@ -222,13 +222,13 @@ assert('Literals Array of symbols') do
     2#{2}
   }
 
-  assert_equal a, [:'abc3def', :'}g']
-  assert_equal b, [:'abc', :'5', :'def', :'(g']
-  assert_equal c, [:'7']
-  assert_equal d, [:'9']
-  assert_equal e, []
-  assert_equal f, [:'[ab', :'cd][ef]']
-  assert_equal g, [:'ab', :'-11', :'22']
+  assert_equal [:'abc3def', :'}g'], a
+  assert_equal [:'abc', :'5', :'def', :'(g'], b
+  assert_equal [:'7'],c
+  assert_equal [:'9'], d
+  assert_equal [], e
+  assert_equal [:'[ab', :'cd][ef]'], f
+  assert_equal [:'ab', :'-11', :'22'], g
 
   a = %i{abc#{1+2}def \}g}
   b = %i(abc #{2+3} def \(g)
@@ -242,13 +242,13 @@ assert('Literals Array of symbols') do
     2#{2}
   }
 
-  assert_equal a, [:'abc#{1+2}def', :'}g']
-  assert_equal b, [:'abc', :'#{2+3}', :'def', :'(g']
-  assert_equal c, [:'#{3+4}']
-  assert_equal d, [:'#{4+5}']
-  assert_equal e, []
-  assert_equal f, [:'[ab', :'cd][ef]']
-  assert_equal g, [:'ab', :'#{-1}1', :'2#{2}']
+  assert_equal [:'abc#{1+2}def', :'}g'], a
+  assert_equal [:'abc', :'#{2+3}', :'def', :'(g'], b
+  assert_equal [:'#{3+4}'], c
+  assert_equal [:'#{4+5}'], d
+  assert_equal [] ,e
+  assert_equal [:'[ab', :'cd][ef]'], f
+  assert_equal [:'ab', :'#{-1}1', :'2#{2}'], g
 end
 
 assert('Literals Symbol', '8.7.6.6') do
@@ -274,14 +274,14 @@ qwe]
   g = %s/foo#{1+2}bar/
   h = %s{{foo bar}}
 
-  assert_equal a, :'asd qwe'
-  assert_equal b, :"foo bar"
-  assert_equal c, :a3b
-  assert_equal d, :asd
-  assert_equal e, :' foo )'
-  assert_equal f, :"asd [\nqwe"
-  assert_equal g, :'foo#{1+2}bar'
-  assert_equal h, :'{foo bar}'
+  assert_equal :'asd qwe', a
+  assert_equal :"foo bar", b
+  assert_equal :a3b, c
+  assert_equal :asd, d
+  assert_equal :' foo )', e
+  assert_equal :"asd [\nqwe", f
+  assert_equal :'foo#{1+2}bar', g
+  assert_equal :'{foo bar}', h
 end
 
 # Not Implemented ATM assert('Literals Regular expression', '8.7.6.5') do
diff --git a/test/t/localjumperror.rb b/test/t/localjumperror.rb
index 857b0ce65..a7d18b3b1 100644
--- a/test/t/localjumperror.rb
+++ b/test/t/localjumperror.rb
@@ -2,7 +2,7 @@
 # LocalJumpError ISO Test
 
 assert('LocalJumpError', '15.2.25') do
-  assert_equal LocalJumpError.class, Class
+  assert_equal Class, LocalJumpError.class
   assert_raise LocalJumpError do
     # this will cause an exception due to the wrong location
     retry
diff --git a/test/t/module.rb b/test/t/module.rb
index 618b57f06..b192361ca 100644
--- a/test/t/module.rb
+++ b/test/t/module.rb
@@ -2,11 +2,11 @@
 # Module ISO Test
 
 assert('Module', '15.2.2') do
-  assert_equal Module.class, Class
+  assert_equal Class, Module.class
 end
 
 assert('Module superclass', '15.2.2.2') do
-  assert_equal Module.superclass, Object
+  assert_equal Object, Module.superclass
 end
 
 # TODO not implemented ATM assert('Module.constants', '15.2.2.3.1') do
@@ -19,7 +19,7 @@ assert('Module#ancestors', '15.2.2.4.9') do
   sc = Test4ModuleAncestors.singleton_class
   r = String.ancestors
 
-  assert_equal r.class, Array
+  assert_equal Array, r.class
   assert_true r.include?(String)
   assert_true r.include?(Object)
 end
@@ -34,7 +34,7 @@ assert('Module#append_features', '15.2.2.4.10') do
     include Test4AppendFeatures
   end
 
-  assert_equal Test4AppendFeatures2.const_get(:Const4AppendFeatures2), Test4AppendFeatures2
+  assert_equal Test4AppendFeatures2, Test4AppendFeatures2.const_get(:Const4AppendFeatures2)
 end
 
 assert('Module#attr NameError') do
@@ -187,9 +187,9 @@ assert('Module#class_eval', '15.2.2.4.15') do
   end
   r = Test4ClassEval.instance_methods
 
-  assert_equal Test4ClassEval.class_eval{ @a }, 11
-  assert_equal Test4ClassEval.class_eval{ @b }, 12
-  assert_equal r.class, Array
+  assert_equal 11, Test4ClassEval.class_eval{ @a }
+  assert_equal 12, Test4ClassEval.class_eval{ @b }
+  assert_equal Array, r.class
   assert_true r.include?(:method1)
 end
 
@@ -207,7 +207,7 @@ assert('Module#class_variable_get', '15.2.2.4.17') do
     @@cv = 99
   end
 
-  assert_equal Test4ClassVariableGet.class_variable_get(:@@cv), 99
+  assert_equal 99, Test4ClassVariableGet.class_variable_get(:@@cv)
 end
 
 assert('Module#class_variable_set', '15.2.2.4.18') do
@@ -221,8 +221,8 @@ assert('Module#class_variable_set', '15.2.2.4.18') do
   assert_true Test4ClassVariableSet.class_variable_set(:@@cv, 99)
   assert_true Test4ClassVariableSet.class_variable_set(:@@foo, 101)
   assert_true Test4ClassVariableSet.class_variables.include? :@@cv
-  assert_equal Test4ClassVariableSet.class_variable_get(:@@cv), 99
-  assert_equal Test4ClassVariableSet.new.foo, 101
+  assert_equal 99, Test4ClassVariableSet.class_variable_get(:@@cv)
+  assert_equal 101, Test4ClassVariableSet.new.foo
 end
 
 assert('Module#class_variables', '15.2.2.4.19') do
@@ -233,8 +233,8 @@ assert('Module#class_variables', '15.2.2.4.19') do
     @@var2 = 2
   end
 
-  assert_equal Test4ClassVariables1.class_variables, [:@@var1]
-  assert_equal Test4ClassVariables2.class_variables, [:@@var2, :@@var1]
+  assert_equal [:@@var1], Test4ClassVariables1.class_variables
+  assert_equal [:@@var2, :@@var1], Test4ClassVariables2.class_variables
 end
 
 assert('Module#const_defined?', '15.2.2.4.20') do
@@ -251,7 +251,7 @@ assert('Module#const_get', '15.2.2.4.21') do
     Const4Test4ConstGet = 42
   end
 
-  assert_equal Test4ConstGet.const_get(:Const4Test4ConstGet), 42
+  assert_equal 42, Test4ConstGet.const_get(:Const4Test4ConstGet)
 end
 
 assert('Module.const_missing', '15.2.2.4.22') do
@@ -261,7 +261,7 @@ assert('Module.const_missing', '15.2.2.4.22') do
     end
   end
 
-  assert_equal Test4ConstMissing.const_get(:ConstDoesntExist), 42
+  assert_equal 42, Test4ConstMissing.const_get(:ConstDoesntExist)
 end
 
 assert('Module#const_get', '15.2.2.4.23') do
@@ -270,7 +270,7 @@ assert('Module#const_get', '15.2.2.4.23') do
   end
 
   assert_true Test4ConstSet.const_set(:Const4Test4ConstSet, 23)
-  assert_equal Test4ConstSet.const_get(:Const4Test4ConstSet), 23
+  assert_equal 23, Test4ConstSet.const_get(:Const4Test4ConstSet)
 end
 
 assert('Module.constants', '15.2.2.4.24') do
@@ -284,8 +284,8 @@ assert('Module.constants', '15.2.2.4.24') do
     $n = constants.sort
   end
 
-  assert_equal TestA.constants, [ :Const ]
-  assert_equal $n, [ :Const, :Const2 ]
+  assert_equal [ :Const ], TestA.constants
+  assert_equal [ :Const, :Const2 ], $n
 end
 
 assert('Module#include', '15.2.2.4.27') do
@@ -296,7 +296,7 @@ assert('Module#include', '15.2.2.4.27') do
     include Test4Include
   end
 
-  assert_equal Test4Include2.const_get(:Const4Include), 42
+  assert_equal 42, Test4Include2.const_get(:Const4Include)
 end
 
 assert('Module#include?', '15.2.2.4.28') do
@@ -324,8 +324,8 @@ assert('Module#included', '15.2.2.4.29') do
     include Test4Included
   end
 
-  assert_equal Test4Included2.const_get(:Const4Included), 42
-  assert_equal Test4Included2.const_get(:Const4Included2), Test4Included2
+  assert_equal 42, Test4Included2.const_get(:Const4Included)
+  assert_equal Test4Included2, Test4Included2.const_get(:Const4Included2)
 end
 
 assert('Module#included_modules', '15.2.2.4.30') do
@@ -336,7 +336,7 @@ assert('Module#included_modules', '15.2.2.4.30') do
   end
   r = Test4includedModules2.included_modules
 
-  assert_equal r.class, Array
+  assert_equal Array, r.class
   assert_true r.include?(Test4includedModules)
 end
 
@@ -353,10 +353,10 @@ assert('Module#instance_methods', '15.2.2.4.33') do
 
   r = Test4InstanceMethodsC.instance_methods(true)
 
-  assert_equal Test4InstanceMethodsA.instance_methods, [:method1]
-  assert_equal Test4InstanceMethodsB.instance_methods(false), [:method2]
-  assert_equal Test4InstanceMethodsC.instance_methods(false), [:method3]
-  assert_equal r.class, Array
+  assert_equal [:method1], Test4InstanceMethodsA.instance_methods
+  assert_equal [:method2], Test4InstanceMethodsB.instance_methods(false)
+  assert_equal [:method3], Test4InstanceMethodsC.instance_methods(false)
+  assert_equal Array, r.class
   assert_true r.include?(:method3)
   assert_true r.include?(:method2)
 end
@@ -391,8 +391,8 @@ assert('Module#module_eval', '15.2.2.4.35') do
     @b = 12
   end
 
-  assert_equal Test4ModuleEval.module_eval{ @a }, 11
-  assert_equal Test4ModuleEval.module_eval{ @b }, 12
+  assert_equal 11, Test4ModuleEval.module_eval{ @a }
+  assert_equal 12, Test4ModuleEval.module_eval{ @b }
 end
 
 assert('Module#remove_class_variable', '15.2.2.4.39') do
@@ -400,7 +400,7 @@ assert('Module#remove_class_variable', '15.2.2.4.39') do
     @@cv = 99
   end
 
-  assert_equal Test4RemoveClassVariable.remove_class_variable(:@@cv), 99
+  assert_equal 99, Test4RemoveClassVariable.remove_class_variable(:@@cv)
   assert_false Test4RemoveClassVariable.class_variables.include? :@@cv
 end
 
@@ -421,7 +421,7 @@ assert('Module#remove_const', '15.2.2.4.40') do
   # Constant removed from Module
   assert_false Test4RemoveConst.const_defined? :ExistingConst
   # Return value of binding
-  assert_equal result, 23
+  assert_equal 23, result
   # Name Error raised when Constant doesn't exist
   assert_true name_error
 end
@@ -472,12 +472,12 @@ assert('Module#to_s') do
   module Test4to_sModules
   end
 
-  assert_equal Test4to_sModules.to_s, 'Test4to_sModules'
+  assert_equal 'Test4to_sModules', Test4to_sModules.to_s
 end
 
 assert('Module#inspect') do
   module Test4to_sModules
   end
 
-  assert_equal Test4to_sModules.inspect, 'Test4to_sModules'
+  assert_equal 'Test4to_sModules', Test4to_sModules.inspect
 end
diff --git a/test/t/nameerror.rb b/test/t/nameerror.rb
index 8b54f3c52..644c6a3cb 100644
--- a/test/t/nameerror.rb
+++ b/test/t/nameerror.rb
@@ -2,11 +2,11 @@
 # NameError ISO Test
 
 assert('NameError', '15.2.31') do
-  assert_equal NameError.class, Class
+  assert_equal Class, NameError.class
 end
 
 assert('NameError superclass', '15.2.31.2') do
-  assert_equal NameError.superclass, StandardError
+  assert_equal StandardError, NameError.superclass
 end
 
 assert('NameError#name', '15.2.31.2.1') do
@@ -26,7 +26,7 @@ end
 assert('NameError#initialize', '15.2.31.2.2') do
    e = NameError.new('a', :foo)
 
-   assert_equal e.class, NameError
-   assert_equal e.message, 'a'
-   assert_equal e.name, :foo
+   assert_equal NameError, e.class
+   assert_equal 'a', e.message
+   assert_equal :foo, e.name
 end
diff --git a/test/t/nil.rb b/test/t/nil.rb
index 08d2acdf1..443178c81 100644
--- a/test/t/nil.rb
+++ b/test/t/nil.rb
@@ -2,7 +2,7 @@
 # NilClass ISO Test
 
 assert('NilClass', '15.2.4') do
-  assert_equal NilClass.class, Class
+  assert_equal Class, NilClass.class
 end
 
 assert('NilClass#&', '15.2.4.3.1') do
@@ -25,5 +25,5 @@ assert('NilClass#nil?', '15.2.4.3.4') do
 end
 
 assert('NilClass#to_s', '15.2.4.3.5') do
-  assert_equal nil.to_s, ''
+  assert_equal '', nil.to_s
 end
diff --git a/test/t/nomethoderror.rb b/test/t/nomethoderror.rb
index 2b1ac8e88..561e545f9 100644
--- a/test/t/nomethoderror.rb
+++ b/test/t/nomethoderror.rb
@@ -9,5 +9,5 @@ assert('NoMethodError', '15.2.32') do
 end
 
 assert('NoMethodError superclass', '15.2.32.2') do
-  assert_equal NoMethodError.superclass, NameError
+  assert_equal NameError, NoMethodError.superclass
 end
diff --git a/test/t/numeric.rb b/test/t/numeric.rb
index 1fa92b662..7dfec3e82 100644
--- a/test/t/numeric.rb
+++ b/test/t/numeric.rb
@@ -2,11 +2,11 @@
 # Numeric ISO Test
 
 assert('Numeric', '15.2.7') do
-  assert_equal Numeric.class, Class
+  assert_equal Class, Numeric.class
 end
 
 assert('Numeric superclass', '15.2.7.2') do
-  assert_equal Numeric.superclass, Object
+  assert_equal Object, Numeric.superclass
 end
 
 assert('Numeric#+@', '15.2.7.4.1') do
@@ -18,12 +18,12 @@ assert('Numeric#-@', '15.2.7.4.2') do
 end
 
 assert('Numeric#abs', '15.2.7.4.3') do
-  assert_equal(1.abs, 1)
-  assert_equal(-1.abs, 1.0)
+  assert_equal(1, 1.abs)
+  assert_equal(1.0, -1.abs)
 end
 
 # Not ISO specified
 
 assert('Numeric#**') do
-  assert_equal 2.0**3, 8.0
+  assert_equal 8.0, 2.0**3
 end
diff --git a/test/t/object.rb b/test/t/object.rb
index 2586f1761..6a755d3ba 100644
--- a/test/t/object.rb
+++ b/test/t/object.rb
@@ -2,10 +2,10 @@
 # Object ISO Test
 
 assert('Object', '15.2.1') do
-  assert_equal Object.class, Class
+  assert_equal Class, Object.class
 end
 
 assert('Object superclass', '15.2.1.2') do
-  assert_equal Object.superclass, BasicObject
+  assert_equal BasicObject, Object.superclass
 end
 
diff --git a/test/t/proc.rb b/test/t/proc.rb
index 56bab8c64..4227772dd 100644
--- a/test/t/proc.rb
+++ b/test/t/proc.rb
@@ -2,11 +2,11 @@
 # Proc ISO Test
 
 assert('Proc', '15.2.17') do
-  assert_equal Proc.class, Class
+  assert_equal Class, Proc.class
 end
 
 assert('Proc superclass', '15.2.17.2') do
-  assert_equal Proc.superclass, Object
+  assert_equal Object, Proc.superclass
 end
 
 assert('Proc.new', '15.2.17.3.1') do
@@ -36,10 +36,10 @@ assert('Proc#arity', '15.2.17.4.2') do
   c = Proc.new {|x=0, y|}.arity
   d = Proc.new {|(x, y), z=0|}.arity
 
-  assert_equal a, 2
-  assert_equal b, -3
-  assert_equal c, 1
-  assert_equal d, 1
+  assert_equal  2, a
+  assert_equal(-3, b)
+  assert_equal  1, c
+  assert_equal  1, d
 end
 
 assert('Proc#call', '15.2.17.4.3') do
@@ -51,6 +51,6 @@ assert('Proc#call', '15.2.17.4.3') do
   b2 = Proc.new { |i| a2 += i }
   b2.call(5)
 
-  assert_equal a, 1
-  assert_equal a2, 5 
+  assert_equal 1, a
+  assert_equal 5, a2
 end
diff --git a/test/t/range.rb b/test/t/range.rb
index da25abc0e..d7294cc1b 100644
--- a/test/t/range.rb
+++ b/test/t/range.rb
@@ -2,11 +2,11 @@
 # Range ISO Test
 
 assert('Range', '15.2.14') do
-  assert_equal Range.class, Class
+  assert_equal Class, Range.class
 end
 
 assert('Range superclass', '15.2.14.2') do
-  assert_equal Range.superclass, Object
+  assert_equal Object, Range.superclass
 end
 
 assert('Range#==', '15.2.14.4.1') do
@@ -23,18 +23,18 @@ assert('Range#===', '15.2.14.4.2') do
 end
 
 assert('Range#begin', '15.2.14.4.3') do
-  assert_equal (1..10).begin, 1
+  assert_equal 1, (1..10).begin
 end
 
 assert('Range#each', '15.2.14.4.4') do
   a = (1..3)
   b = 0
   a.each {|i| b += i}
-  assert_equal b, 6
+  assert_equal 6, b
 end
 
 assert('Range#end', '15.2.14.4.5') do
-  assert_equal (1..10).end, 10
+  assert_equal 10, (1..10).end
 end
 
 assert('Range#exclude_end?', '15.2.14.4.6') do
@@ -43,7 +43,7 @@ assert('Range#exclude_end?', '15.2.14.4.6') do
 end
 
 assert('Range#first', '15.2.14.4.7') do
-  assert_equal (1..10).first, 1
+  assert_equal 1, (1..10).first
 end
 
 assert('Range#include', '15.2.14.4.8') do
@@ -57,14 +57,14 @@ assert('Range#initialize', '15.2.14.4.9') do
   a = Range.new(1, 10, true)
   b = Range.new(1, 10, false)
 
-  assert_equal a, (1...10)
+  assert_equal (1...10), a
   assert_true a.exclude_end?
-  assert_equal b, (1..10)
+  assert_equal (1..10), b
   assert_false b.exclude_end?
 end
 
 assert('Range#last', '15.2.14.4.10') do
-  assert_equal (1..10).last, 10
+  assert_equal 10, (1..10).last
 end
 
 assert('Range#member?', '15.2.14.4.11') do
diff --git a/test/t/rangeerror.rb b/test/t/rangeerror.rb
index 2a15ce225..8dc683745 100644
--- a/test/t/rangeerror.rb
+++ b/test/t/rangeerror.rb
@@ -2,9 +2,9 @@
 # RangeError ISO Test
 
 assert('RangeError', '15.2.26') do
-  assert_equal RangeError.class, Class
+  assert_equal Class, RangeError.class
 end
 
 assert('RangeError superclass', '15.2.26.2') do
-  assert_equal RangeError.superclass, StandardError
+  assert_equal StandardError, RangeError.superclass
 end
diff --git a/test/t/runtimeerror.rb b/test/t/runtimeerror.rb
index b8d64a726..d02cba96d 100644
--- a/test/t/runtimeerror.rb
+++ b/test/t/runtimeerror.rb
@@ -2,5 +2,5 @@
 # RuntimeError ISO Test
 
 assert('RuntimeError', '15.2.28') do
-  assert_equal RuntimeError.class, Class
+  assert_equal Class, RuntimeError.class
 end
diff --git a/test/t/standarderror.rb b/test/t/standarderror.rb
index 42b06d911..cab99834e 100644
--- a/test/t/standarderror.rb
+++ b/test/t/standarderror.rb
@@ -2,9 +2,9 @@
 # StandardError ISO Test
 
 assert('StandardError', '15.2.23') do
-  assert_equal StandardError.class, Class
+  assert_equal Class, StandardError.class
 end
 
 assert('StandardError superclass', '15.2.23.2') do
-  assert_equal StandardError.superclass, Exception
+  assert_equal Exception, StandardError.superclass
 end
diff --git a/test/t/string.rb b/test/t/string.rb
index c208835b4..d4df063da 100644
--- a/test/t/string.rb
+++ b/test/t/string.rb
@@ -2,19 +2,19 @@
 # String ISO Test
 
 assert('String', '15.2.10') do
-  assert_equal String.class, Class
+  assert_equal Class, String.class
 end
 
 assert('String superclass', '15.2.10.2') do
-  assert_equal String.superclass, Object
+  assert_equal Object, String.superclass
 end
 
 assert('String#*', '15.2.10.5.1') do
-  assert_equal 'a' * 5, 'aaaaa'
+  assert_equal 'aaaaa', 'a' * 5
 end
 
 assert('String#+', '15.2.10.5.2') do
-  assert_equal 'a' + 'b', 'ab'
+  assert_equal 'ab', 'a' + 'b'
 end
 
 assert('String#<=>', '15.2.10.5.3') do
@@ -24,11 +24,11 @@ assert('String#<=>', '15.2.10.5.3') do
   d = 'abc' <=> 'cba'
   e = 'cba' <=> 'abc'
 
-  assert_equal a, 0
-  assert_equal b, -1
-  assert_equal c, 1
-  assert_equal d, -1
-  assert_equal e, 1
+  assert_equal  0, a
+  assert_equal(-1, b)
+  assert_equal  1, c
+  assert_equal(-1, d)
+  assert_equal  1, e
 end
 
 assert('String#==', '15.2.10.5.4') do
@@ -59,16 +59,16 @@ assert('String#[]', '15.2.10.5.6') do
   a3 = 'abc'['bc']
   b3 = 'abc'['XX']
 
-  assert_equal a, 'a'
-  assert_equal b, 'c'
+  assert_equal 'a', a
+  assert_equal 'c', b
   assert_nil c
   assert_nil d
   assert_nil a1
   assert_nil b1
   assert_nil c1
-  assert_equal d1, ''
-  assert_equal e1, 'bc'
-  assert_equal a3, 'bc'
+  assert_equal '', d1
+  assert_equal 'bc', e1
+  assert_equal 'bc', a3
   assert_nil b3
 end
 
@@ -92,23 +92,23 @@ assert('String#[] with Range') do
   h2 = 'abc'[3...4]
   i2 = 'abc'[4...5]
 
-  assert_equal a1, ''  
-  assert_equal b1, 'b' 
-  assert_equal c1, 'bc'
-  assert_equal d1, 'bc'
-  assert_equal e1, 'bc'
-  assert_equal f1, 'ab'
-  assert_equal g1, 'bc'
-  assert_equal h1, ''  
+  assert_equal '', a1
+  assert_equal 'b', b1
+  assert_equal 'bc', c1
+  assert_equal 'bc', d1
+  assert_equal 'bc', e1
+  assert_equal 'ab', f1
+  assert_equal 'bc', g1
+  assert_equal '', h1
   assert_nil i2
-  assert_equal a2, ''  
-  assert_equal b2, ''  
-  assert_equal c2, 'b' 
-  assert_equal d2, 'bc'
-  assert_equal e2, 'bc'
-  assert_equal f2, 'a' 
-  assert_equal g2, 'bc'
-  assert_equal h2, ''  
+  assert_equal '', a2
+  assert_equal '', b2
+  assert_equal 'b', c2
+  assert_equal 'bc', d2
+  assert_equal 'bc', e2
+  assert_equal 'a', f2
+  assert_equal 'bc', g2
+  assert_equal '', h2
   assert_nil i2
 end
 
@@ -116,15 +116,15 @@ assert('String#capitalize', '15.2.10.5.7') do
   a = 'abc'
   a.capitalize
 
-  assert_equal a, 'abc'
-  assert_equal 'abc'.capitalize, 'Abc'
+  assert_equal 'abc', a
+  assert_equal 'Abc', 'abc'.capitalize
 end
 
 assert('String#capitalize!', '15.2.10.5.8') do
   a = 'abc'
   a.capitalize!
 
-  assert_equal a, 'Abc'
+  assert_equal 'Abc', a
 end
 
 assert('String#chomp', '15.2.10.5.9') do
@@ -137,12 +137,12 @@ assert('String#chomp', '15.2.10.5.9') do
 
   f.chomp
 
-  assert_equal a, 'abc'
-  assert_equal b, ''
-  assert_equal c, 'abc'
-  assert_equal d, "abc\n"
-  assert_equal e, 'abc'
-  assert_equal f, "abc\n"
+  assert_equal 'abc', a
+  assert_equal '', b
+  assert_equal 'abc', c
+  assert_equal "abc\n", d
+  assert_equal 'abc', e
+  assert_equal "abc\n", f
 end
 
 assert('String#chomp!', '15.2.10.5.10') do
@@ -158,11 +158,11 @@ assert('String#chomp!', '15.2.10.5.10') do
   d.chomp!
   e.chomp!("\t")
 
-  assert_equal a, 'abc'
-  assert_equal b, ''
-  assert_equal c, 'abc'
-  assert_equal d, "abc\n"
-  assert_equal e, 'abc'
+  assert_equal 'abc', a
+  assert_equal '', b
+  assert_equal 'abc', c
+  assert_equal "abc\n", d
+  assert_equal 'abc', e
 end
 
 assert('String#chop', '15.2.10.5.11') do
@@ -172,9 +172,9 @@ assert('String#chop', '15.2.10.5.11') do
 
   c.chop
 
-  assert_equal a, ''
-  assert_equal b, 'ab'
-  assert_equal c, 'abc'
+  assert_equal '', a
+  assert_equal 'ab', b
+  assert_equal 'abc', c
 end
 
 assert('String#chop!', '15.2.10.5.12') do
@@ -194,8 +194,8 @@ assert('String#downcase', '15.2.10.5.13') do
 
   b.downcase
 
-  assert_equal a, 'abc'
-  assert_equal b, 'ABC'
+  assert_equal 'abc', a
+  assert_equal 'ABC', b
 end
 
 assert('String#downcase!', '15.2.10.5.14') do
@@ -203,7 +203,7 @@ assert('String#downcase!', '15.2.10.5.14') do
 
   a.downcase!
 
-  assert_equal a, 'abc'
+  assert_equal 'abc', a
 end
 
 assert('String#each_line', '15.2.10.5.15') do
@@ -249,14 +249,14 @@ assert('String#gsub!', '15.2.10.5.19') do
   b = 'abcabc'
   b.gsub!('b') { |w| w.capitalize }
 
-  assert_equal a, 'aBcaBc'
-  assert_equal b, 'aBcaBc'
+  assert_equal 'aBcaBc', a
+  assert_equal 'aBcaBc', b
 end
 
 assert('String#hash', '15.2.10.5.20') do
   a = 'abc'
 
-  assert_equal a.hash, 'abc'.hash
+  assert_equal 'abc'.hash, a.hash
 end
 
 assert('String#include?', '15.2.10.5.21') do
@@ -267,31 +267,31 @@ assert('String#include?', '15.2.10.5.21') do
 end
 
 assert('String#index', '15.2.10.5.22') do
-  assert_equal 'abc'.index('a'), 0
+  assert_equal 0, 'abc'.index('a')
   assert_nil 'abc'.index('d')
-  assert_equal 'abcabc'.index('a', 1), 3
+  assert_equal 3, 'abcabc'.index('a', 1)
 end
 
 assert('String#initialize', '15.2.10.5.23') do
   a = ''
   a.initialize('abc')
 
-  assert_equal a, 'abc'
+  assert_equal 'abc', a
 end
 
 assert('String#initialize_copy', '15.2.10.5.24') do
   a = ''
   a.initialize_copy('abc')
 
-  assert_equal a, 'abc'
+  assert_equal 'abc', a
 end
 
 assert('String#intern', '15.2.10.5.25') do
-  assert_equal 'abc'.intern, :abc
+  assert_equal :abc, 'abc'.intern
 end
 
 assert('String#length', '15.2.10.5.26') do
-  assert_equal 'abc'.length, 3
+  assert_equal 3, 'abc'.length
 end
 
 # 'String#match', '15.2.10.5.27' will be tested in mrbgems.
@@ -300,36 +300,36 @@ assert('String#replace', '15.2.10.5.28') do
   a = ''
   a.replace('abc')
 
-  assert_equal a, 'abc'
+  assert_equal 'abc', a
 end
 
 assert('String#reverse', '15.2.10.5.29') do
   a = 'abc'
   a.reverse
 
-  assert_equal a, 'abc'
-  assert_equal 'abc'.reverse, 'cba'
+  assert_equal 'abc', a
+  assert_equal 'cba', 'abc'.reverse
 end
 
 assert('String#reverse!', '15.2.10.5.30') do
   a = 'abc'
   a.reverse!
 
-  assert_equal a, 'cba'
-  assert_equal 'abc'.reverse!, 'cba'
+  assert_equal 'cba', a
+  assert_equal 'cba', 'abc'.reverse!
 end
 
 assert('String#rindex', '15.2.10.5.31') do
-  assert_equal 'abc'.rindex('a'), 0
+  assert_equal 0, 'abc'.rindex('a')
   assert_nil 'abc'.rindex('d')
-  assert_equal 'abcabc'.rindex('a', 1), 0
-  assert_equal 'abcabc'.rindex('a', 4), 3
+  assert_equal 0, 'abcabc'.rindex('a', 1)
+  assert_equal 3, 'abcabc'.rindex('a', 4)
 end
 
 # 'String#scan', '15.2.10.5.32' will be tested in mrbgems.
 
 assert('String#size', '15.2.10.5.33') do
-  assert_equal 'abc'.size, 3
+  assert_equal 3, 'abc'.size
 end
 
 assert('String#slice', '15.2.10.5.34') do
@@ -356,33 +356,33 @@ assert('String#slice', '15.2.10.5.34') do
   a3 = 'abc'.slice('bc')
   b3 = 'abc'.slice('XX')
 
-  assert_equal a, 'a'
-  assert_equal b, 'c'
+  assert_equal 'a', a
+  assert_equal 'c', b
   assert_nil c
   assert_nil d
   assert_nil a1
   assert_nil b1
   assert_nil c1
-  assert_equal d1, ''
-  assert_equal e1, 'bc'
-  assert_equal e11, 'b'
-  assert_equal a3, 'bc'
+  assert_equal '', d1
+  assert_equal 'bc', e1
+  assert_equal 'b', e11
+  assert_equal 'bc', a3
   assert_nil b3
 end
 
 # TODO Broken ATM
 assert('String#split', '15.2.10.5.35') do
   # without RegExp behavior is actually unspecified
-  assert_equal 'abc abc abc'.split, ['abc', 'abc', 'abc']
-  assert_equal 'a,b,c,,d'.split(','), ["a", "b", "c", "", "d"]
-  assert_equal 'abc abc abc'.split(nil), ['abc', 'abc', 'abc']
-  assert_equal 'abc'.split(""), ['a', 'b', 'c']
+  assert_equal ['abc', 'abc', 'abc'], 'abc abc abc'.split
+  assert_equal ["a", "b", "c", "", "d"], 'a,b,c,,d'.split(',')
+  assert_equal ['abc', 'abc', 'abc'], 'abc abc abc'.split(nil)
+  assert_equal ['a', 'b', 'c'], 'abc'.split("")
 end
 
 assert('String#sub', '15.2.10.5.36') do
-  assert_equal 'abcabc'.sub('b', 'B'), 'aBcabc'
-  assert_equal 'abcabc'.sub('b') { |w| w.capitalize }, 'aBcabc'
-  assert_equal 'aa#'.sub('#', '$'), 'aa$'
+  assert_equal 'aBcabc', 'abcabc'.sub('b', 'B')
+  assert_equal 'aBcabc', 'abcabc'.sub('b') { |w| w.capitalize }
+  assert_equal 'aa$', 'aa#'.sub('#', '$')
 end
 
 assert('String#sub!', '15.2.10.5.37') do
@@ -392,8 +392,8 @@ assert('String#sub!', '15.2.10.5.37') do
   b = 'abcabc'
   b.sub!('b') { |w| w.capitalize }
 
-  assert_equal a, 'aBcabc'
-  assert_equal b, 'aBcabc'
+  assert_equal 'aBcabc', a
+  assert_equal 'aBcabc', b
 end
 
 
@@ -403,10 +403,10 @@ assert('String#to_i', '15.2.10.5.38') do
   c = 'a'.to_i(16)
   d = '100'.to_i(2)
 
-  assert_equal a, 0
-  assert_equal b, 32143
-  assert_equal c, 10
-  assert_equal d, 4
+  assert_equal 0, a
+  assert_equal 32143, b
+  assert_equal 10, c
+  assert_equal 4, d
 end
 
 assert('String#to_f', '15.2.10.5.39') do
@@ -414,17 +414,17 @@ assert('String#to_f', '15.2.10.5.39') do
   b = '123456789'.to_f
   c = '12345.6789'.to_f
 
-  assert_float(a, 0.0)
-  assert_float(b, 123456789.0)
-  assert_float(c, 12345.6789)
+  assert_float(0.0, a)
+  assert_float(123456789.0, b)
+  assert_float(12345.6789, c)
 end
 
 assert('String#to_s', '15.2.10.5.40') do
-  assert_equal 'abc'.to_s, 'abc'
+  assert_equal 'abc', 'abc'.to_s
 end
 
 assert('String#to_sym', '15.2.10.5.41') do
-  assert_equal 'abc'.to_sym, :abc
+  assert_equal :abc, 'abc'.to_sym
 end
 
 assert('String#upcase', '15.2.10.5.42') do
@@ -433,8 +433,8 @@ assert('String#upcase', '15.2.10.5.42') do
 
   b.upcase
 
-  assert_equal a, 'ABC'
-  assert_equal b, 'abc'
+  assert_equal 'ABC', a
+  assert_equal 'abc', b
 end
 
 assert('String#upcase!', '15.2.10.5.43') do
@@ -442,14 +442,14 @@ assert('String#upcase!', '15.2.10.5.43') do
 
   a.upcase!
 
-  assert_equal a, 'ABC'
+  assert_equal 'ABC', a
 end
 
 # Not ISO specified
 
 assert('String interpolation (mrb_str_concat for shared strings)') do
   a = "A" * 32
-  assert_equal "#{a}:", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:"
+  assert_equal "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:", "#{a}:"
 end
 
 assert('Check the usage of a NUL character') do
@@ -463,8 +463,8 @@ assert('String#bytes') do
   str2 = "\xFF"
   bytes2 = [0xFF]
 
-  assert_equal str1.bytes, bytes1
-  assert_equal str2.bytes, bytes2
+  assert_equal bytes1, str1.bytes
+  assert_equal bytes2, str2.bytes
 end
 
 assert('String#each_byte') do
@@ -479,5 +479,5 @@ end
 
 assert('String#inspect') do
   ("\1" * 100).inspect  # should not raise an exception - regress #1210
-  assert_equal "\0".inspect, "\"\\000\""
+  assert_equal "\"\\000\"", "\0".inspect
 end
diff --git a/test/t/symbol.rb b/test/t/symbol.rb
index e4ced61e0..f852dcd00 100644
--- a/test/t/symbol.rb
+++ b/test/t/symbol.rb
@@ -2,11 +2,11 @@
 # Symbol ISO Test
 
 assert('Symbol', '15.2.11') do
-  assert_equal Symbol.class, Class
+  assert_equal Class, Symbol.class
 end
 
 assert('Symbol superclass', '15.2.11.2') do
-  assert_equal Symbol.superclass, Object
+  assert_equal Object, Symbol.superclass
 end
 
 assert('Symbol#===', '15.2.11.3.1') do
@@ -15,13 +15,13 @@ assert('Symbol#===', '15.2.11.3.1') do
 end
 
 assert('Symbol#id2name', '15.2.11.3.2') do
-  assert_equal :abc.id2name, 'abc'
+  assert_equal 'abc', :abc.id2name
 end
 
 assert('Symbol#to_s', '15.2.11.3.3') do
-  assert_equal :abc.to_s, 'abc'
+  assert_equal  'abc', :abc.to_s
 end
 
 assert('Symbol#to_sym', '15.2.11.3.4') do
-  assert_equal :abc.to_sym, :abc
+  assert_equal :abc, :abc.to_sym
 end
diff --git a/test/t/syntax.rb b/test/t/syntax.rb
index b975d0103..c87a81e06 100644
--- a/test/t/syntax.rb
+++ b/test/t/syntax.rb
@@ -22,7 +22,7 @@ assert('super', '11.3.4') do
   bar = SuperBar.new
 
   assert_true bar.foo
-  assert_equal bar.bar(1,2,3), [1,2,3]
+  assert_equal [1,2,3], bar.bar(1,2,3)
 end
 
 assert('yield', '11.3.5') do
@@ -37,9 +37,9 @@ assert('Abbreviated variable assignment', '11.4.2.3.2') do
   c = 1
   c += 2
 
-  assert_equal a, 1
+  assert_equal 1, a
   assert_nil b
-  assert_equal c, 3
+  assert_equal 3, c
 end
 
 assert('Nested const reference') do
@@ -51,8 +51,8 @@ assert('Nested const reference') do
       end
     end
   end
-  assert_equal Syntax4Const::CONST1, "hello world"
-  assert_equal Syntax4Const::Const2.new.const1, "hello world"
+  assert_equal "hello world", Syntax4Const::CONST1
+  assert_equal "hello world", Syntax4Const::Const2.new.const1
 end
 
 assert('Abbreviated variable assignment as returns') do
@@ -63,7 +63,7 @@ assert('Abbreviated variable assignment as returns') do
       end
     end
   end
-  assert_equal Syntax4AbbrVarAsgnAsReturns::A.new.b, 1
+  assert_equal 1, Syntax4AbbrVarAsgnAsReturns::A.new.b
 end
 
 assert('Splat and mass assignment') do
diff --git a/test/t/true.rb b/test/t/true.rb
index 9ea68f81b..3aebf43a1 100644
--- a/test/t/true.rb
+++ b/test/t/true.rb
@@ -2,11 +2,11 @@
 # TrueClass ISO Test
 
 assert('TrueClass', '15.2.5') do
-  assert_equal TrueClass.class, Class
+  assert_equal Class, TrueClass.class
 end
 
 assert('TrueClass superclass', '15.2.5.2') do
-  assert_equal TrueClass.superclass, Object
+  assert_equal Object, TrueClass.superclass
 end
 
 assert('TrueClass true', '15.2.5.1') do
@@ -24,7 +24,7 @@ assert('TrueClass#^', '15.2.5.3.2') do
 end
 
 assert('TrueClass#to_s', '15.2.5.3.3') do
-  assert_equal true.to_s, 'true'
+  assert_equal 'true', true.to_s
 end
 
 assert('TrueClass#|', '15.2.5.3.4') do
diff --git a/test/t/typeerror.rb b/test/t/typeerror.rb
index 59c3ea993..a91fb1be2 100644
--- a/test/t/typeerror.rb
+++ b/test/t/typeerror.rb
@@ -2,10 +2,10 @@
 # TypeError ISO Test
 
 assert('TypeError', '15.2.29') do
-  assert_equal TypeError.class, Class
+  assert_equal Class, TypeError.class
 end
 
 assert('TypeError superclass', '15.2.29.2') do
-  assert_equal TypeError.superclass, StandardError
+  assert_equal StandardError, TypeError.superclass
 end