diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 1fed0f9..82c336c 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -761,11 +761,9 @@ class EnvironmentTest < ActiveSupport::TestCase
     env = Environment.new
     env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
 
-    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => 'true', 'signup' => 'true'}}, env.custom_person_fields)
-  end
-
-  should 'have no custom_person_fields by default' do
-    assert_equal({}, Environment.new.custom_person_fields)
+    assert_equal({'required' => 'true', 'active' => 'true', 'signup' => 'true'}, env.custom_person_fields['cell_phone'])
+    assert_equal({'required' => '', 'active' => 'true', 'signup' => '' }, env.custom_person_fields['comercial_phone'])
+    assert_equal({'required' => '', 'active' => 'true', 'signup' => 'true'}, env.custom_person_fields['description'])
   end
 
   should 'not set in custom_person_fields if not in person.fields' do
@@ -773,7 +771,7 @@ class EnvironmentTest < ActiveSupport::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'comercial_phone'])
 
     env.custom_person_fields = { 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'cell_phone' => {'required' => 'true','signup' => 'true',  'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'required' => 'true','signup' => 'true',  'active' => 'true'}, env.custom_person_fields['cell_phone'])
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
 
@@ -782,7 +780,8 @@ class EnvironmentTest < ActiveSupport::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'schooling'])
 
     env.custom_person_fields = { 'schooling' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'schooling' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}, 'schooling_status' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'required' => 'true', 'signup' => 'true', 'active' => 'true'}, env.custom_person_fields['schooling'])
+    assert_equal({'required' => 'true', 'signup' => 'true', 'active' => 'true'}, env.custom_person_fields['schooling_status'])
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
 
--
libgit2 0.21.2