diff --git a/lib/faker/elder_scrolls.rb b/lib/faker/elder_scrolls.rb
index 342274403e..0b05144865 100644
--- a/lib/faker/elder_scrolls.rb
+++ b/lib/faker/elder_scrolls.rb
@@ -29,10 +29,9 @@ def first_name
         fetch('elder_scrolls.first_name')
       end
 
-      def first_name
+      def last_name
         fetch('elder_scrolls.last_name')
       end
-
     end
   end
 end
diff --git a/test/test_faker_elder_scrolls.rb b/test/test_faker_elder_scrolls.rb
index b2ddf926f4..9a0c5e5520 100644
--- a/test/test_faker_elder_scrolls.rb
+++ b/test/test_faker_elder_scrolls.rb
@@ -30,4 +30,11 @@ def test_name
     assert @tester.name.match(/\w+/)
   end
 
+  def test_first_name
+    assert @tester.first_name.match(/\w+/)
+  end
+
+  def test_last_name
+    assert @tester.last_name.match(/\w+/)
+  end
 end
diff --git a/test/test_faker_omniauth.rb b/test/test_faker_omniauth.rb
index d047183fe0..614b633b93 100644
--- a/test/test_faker_omniauth.rb
+++ b/test/test_faker_omniauth.rb
@@ -57,8 +57,7 @@ def test_omniauth_google_with_name
     auth                  = @tester.google(name: custom_name)
     info                  = auth[:info]
     extra_raw_info        = auth[:extra][:raw_info]
-    id_info               = auth[:id_info]
-
+    
     assert_instance_of String, info[:name]
     assert_equal 2, word_count(info[:name])
     assert_equal custom_name, info[:name]
@@ -184,7 +183,6 @@ def test_omniauth_facebook_with_email
   def test_omniauth_facebook_with_uid
     custom_uid      = '12345'
     auth            = @tester.facebook(uid: custom_uid)
-    info            = auth[:info]
     extra_raw_info  = auth[:extra][:raw_info]
 
     assert_instance_of String, auth[:uid]
@@ -286,7 +284,6 @@ def test_omniauth_twitter_with_nickname
   def test_omniauth_twitter_with_uid
     custom_uid  = '12345'
     auth        = @tester.twitter(uid: custom_uid)
-    info        = auth[:info]
     raw_info    = auth[:extra][:raw_info]
 
     assert_instance_of String, auth[:uid]
@@ -465,7 +462,6 @@ def test_omniauth_github_with_email
   def test_omniauth_github_with_uid
     custom_uid      = '12345'
     auth            = @tester.github(uid: custom_uid)
-    info            = auth[:info]
     extra_raw_info  = auth[:extra][:raw_info]
 
     assert_instance_of String, auth[:uid]
diff --git a/test/test_zh_locale.rb b/test/test_zh_locale.rb
index 6bece1c36c..65e08b9bf6 100644
--- a/test/test_zh_locale.rb
+++ b/test/test_zh_locale.rb
@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
 
-class TestZhCnLocale < Test::Unit::TestCase
+class TestZhLocale < Test::Unit::TestCase
   def setup
     Faker::Config.locale = 'zh-CN'
   end