diff --git a/lib/faker/code.rb b/lib/faker/code.rb
index 27c89f7224..88a5771343 100644
--- a/lib/faker/code.rb
+++ b/lib/faker/code.rb
@@ -77,9 +77,9 @@ def generate_imei
 
         # Calculate the Luhn checksum of the values thus far
         len_offset = (len + 1) % 2
-        (0..(len - 1)).each do |pos|
-          if (pos + len_offset) % 2 != 0
-            t = str[pos] * 2
+        (0..(len - 1)).each do |position|
+          if (position + len_offset) % 2 != 0
+            t = str[position] * 2
 
             if t > 9
               t -= 9
@@ -87,7 +87,7 @@ def generate_imei
 
             sum += t
           else
-            sum += str[pos]
+            sum += str[position]
           end
         end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index dcbd0846f1..13a7a6577f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,7 +2,7 @@
 require 'rubygems'
 require 'timecop'
 require 'yaml'
-YAML::ENGINE.yamler = 'syck' if defined? YAML::ENGINE
+YAML::ENGINE.yamler = 'psych' if defined? YAML::ENGINE
 require File.expand_path(File.dirname(__FILE__) + '/../lib/faker')
 
 # configure I18n