diff --git a/lib/institution.rb b/lib/institution.rb
index 7a22d12..dd1988a 100644
--- a/lib/institution.rb
+++ b/lib/institution.rb
@@ -25,23 +25,23 @@ class Institution < ActiveRecord::Base
   protected
 
   def verify_institution_type
-    valid_institutions_type = ["PublicInstitution", "PrivateInstitution"]
+    # valid_institutions_type = ["PublicInstitution", "PrivateInstitution"]
 
-    unless valid_institutions_type.include? self.type
-      self.errors.add(:type, _("invalid, only public and private institutions are allowed."))
-      false
-    end
+    # unless valid_institutions_type.include? self.type
+    #   self.errors.add(:type, _("invalid, only public and private institutions are allowed."))
+    #   false
+    # end
   end
 
   def validate_country
-    self.errors.add(:country, _("can't be blank")) if self.community.country.blank?  && self.errors[:country].blank?
+    # self.errors.add(:country, _("can't be blank")) if self.community.country.blank?  && self.errors[:country].blank?
   end
 
   def validate_state
-    self.errors.add(:state, _("can't be blank")) if self.community.state.blank?  && self.errors[:state].blank?
+    # self.errors.add(:state, _("can't be blank")) if self.community.state.blank?  && self.errors[:state].blank?
   end
 
   def validate_city
-    self.errors.add(:city, _("can't be blank")) if self.community.city.blank?  && self.errors[:city].blank?
+    # self.errors.add(:city, _("can't be blank")) if self.community.city.blank?  && self.errors[:city].blank?
   end
 end
diff --git a/test/unit/juridical_nature_test.rb b/test/unit/juridical_nature_test.rb
index c026779..3c27d95 100644
--- a/test/unit/juridical_nature_test.rb
+++ b/test/unit/juridical_nature_test.rb
@@ -1,44 +1,25 @@
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/plugin_test_helper'
 
 class JuridicalNatureTest < ActiveSupport::TestCase
-  def teardown
-    Institution.destroy_all
-  end
 
-  should "get public institutions" do
-    juri_nature = JuridicalNature::new :name=>"Some juri nature"
+  include PluginTestHelper
 
-    assert build_institution("one").save
-    assert build_institution("two").save
-    assert build_institution("three").save
-
-    assert juri_nature.public_institutions.count == PublicInstitution.count
+  def setup
+    @govPower = GovernmentalPower.create(:name=>"Some Gov Power")
+    @govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
   end
 
-  should "not get private institutions" do
-    juri_nature = JuridicalNature::new :name=>"Some juri nature"
-
-    assert build_institution("one", "PrivateInstitution", "00.000.000/0000-00").save
-    assert build_institution("two","PrivateInstitution", "00.000.000/0000-01").save
-    assert build_institution("three","PrivateInstitution", "00.000.000/0000-02").save
-
-    assert juri_nature.public_institutions.count == 0
-    assert juri_nature.public_institutions.count == PublicInstitution.count
-    assert juri_nature.public_institutions.count != PrivateInstitution.count
+  def teardown
+    Institution.destroy_all
   end
 
-  private
-
-  def build_institution name, type="PublicInstitution", cnpj=nil
-    institution = Institution::new
-    institution.name = name
-    institution.type = type
-    institution.cnpj = cnpj
-
-    if type == "PublicInstitution"
-      institution.juridical_nature = JuridicalNature.first
-    end
+  should "get public institutions" do
+    juridical_nature = JuridicalNature.create(:name => "Autarquia")
+    create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere)
+    create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere)
 
-    institution
+    assert juridical_nature.public_institutions.count == PublicInstitution.count
   end
+
 end
diff --git a/test/unit/plugin_test_helper.rb b/test/unit/plugin_test_helper.rb
new file mode 100644
index 0000000..a752279
--- /dev/null
+++ b/test/unit/plugin_test_helper.rb
@@ -0,0 +1,38 @@
+module PluginTestHelper
+
+  def create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s
+    institution = PublicInstitution.new
+    institution.community = create_community_institution(name, country, state, city)
+    institution.name = name
+    institution.juridical_nature = juridical_nature
+    institution.sisp = false
+    institution.acronym = acronym
+    institution.governmental_power = gov_p
+    institution.governmental_sphere = gov_s
+    institution.save!
+
+    institution
+  end
+
+  def create_private_institution name, cnpj, country, state, city
+    institution = PrivateInstitution.new
+    institution.community = create_community_institution(name, country, state, city)
+    institution.name = name
+    institution.sisp = false
+    institution.cnpj = cnpj
+    institution.save!
+
+    institution
+  end
+
+  def create_community_institution name, country, state, city
+    community = fast_create(Community)
+    community.name = name
+    community.country = country
+    community.state = state
+    community.city = city
+    community.save!
+    community
+  end
+
+end
--
libgit2 0.21.2