diff --git a/src/noosfero-spb/gov_user/features/institution_registration.feature b/src/noosfero-spb/gov_user/features/institution_registration.feature
index 0ce0a19..f4df827 100644
--- a/src/noosfero-spb/gov_user/features/institution_registration.feature
+++ b/src/noosfero-spb/gov_user/features/institution_registration.feature
@@ -5,7 +5,7 @@ Feature: Institution Field
 
   Background:
     Given plugin GovUser is enabled on environment
-    And I am logged in as mpog_admin
+    And I am logged in as admin
     And Institutions has initial default values on database
 
   @selenium
diff --git a/src/noosfero-spb/gov_user/features/step_definitions/gov_user_steps.rb b/src/noosfero-spb/gov_user/features/step_definitions/gov_user_steps.rb
index fd71abc..b053e89 100644
--- a/src/noosfero-spb/gov_user/features/step_definitions/gov_user_steps.rb
+++ b/src/noosfero-spb/gov_user/features/step_definitions/gov_user_steps.rb
@@ -69,22 +69,3 @@ end
 Given /^I sleep for (\d+) seconds$/ do |time|
   sleep time.to_i
 end
-
-Given /^I am logged in as mpog_admin$/ do
-  visit('/account/logout')
-
-  user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
-  person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
-  user.person = person
-  user.save!
-
-  user.activate
-  e = Environment.default
-  e.add_admin(user.person)
-
-  visit('/account/login')
-  fill_in("Username", :with => user.login)
-  fill_in("Password", :with => '123456')
-  click_button("Log in")
-end
-
diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_power.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_power.rb
index 9e2e909..f6e8db9 100644
--- a/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_power.rb
+++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_power.rb
@@ -1,4 +1,4 @@
-class GovUserPlugin::GovernmentalPower < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::GovernmentalPower < ActiveRecord::Base
   attr_accessible :name
 
   validates :name, :presence=>true, :uniqueness=>true
diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_sphere.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_sphere.rb
index 5a16100..b82471e 100644
--- a/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_sphere.rb
+++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_sphere.rb
@@ -1,4 +1,4 @@
-class GovUserPlugin::GovernmentalSphere < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::GovernmentalSphere < ActiveRecord::Base
   attr_accessible :name
 
   validates :name, :presence=>true, :uniqueness=>true
diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin/institution.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin/institution.rb
index 73bb1e9..bc942af 100644
--- a/src/noosfero-spb/gov_user/lib/gov_user_plugin/institution.rb
+++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin/institution.rb
@@ -1,4 +1,4 @@
-class GovUserPlugin::Institution < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::Institution < ActiveRecord::Base
   has_many :comments
 
   SEARCH_FILTERS = {
@@ -28,8 +28,8 @@ class GovUserPlugin::Institution < Noosfero::Plugin::ActiveRecord
 
   belongs_to :community
 
-  scope :public, :conditions => { :type => "GovUserPlugin::PublicInstitution" }
-  scope :private, :conditions => { :type => "GovUserPlugin::PrivateInstitution" }
+  scope :is_public, :conditions => { :type => "GovUserPlugin::PublicInstitution" }
+  scope :is_private, :conditions => { :type => "GovUserPlugin::PrivateInstitution" }
   scope :search_institution, lambda{ |value|
     where("name ilike ? OR acronym ilike ?", "%#{value}%", "%#{value}%" )
   }
diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_organization_ratings.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_organization_ratings.rb
index 2d71b10..79dab23 100644
--- a/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_organization_ratings.rb
+++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_organization_ratings.rb
@@ -1,4 +1,4 @@
-class GovUserPlugin::InstitutionsOrganizationRatings < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::InstitutionsOrganizationRatings < ActiveRecord::Base
   self.primary_key = :institution_id
 
   attr_accessible :institution, :organization_rating
diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_users.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_users.rb
index 055a754..c0f5e76 100644
--- a/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_users.rb
+++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_users.rb
@@ -1,4 +1,4 @@
-class GovUserPlugin::InstitutionsUsers < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::InstitutionsUsers < ActiveRecord::Base
   belongs_to :user
   belongs_to :institution, :class_name => 'GovUserPlugin::Institution'
 end
diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin/juridical_nature.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin/juridical_nature.rb
index 4b2ae58..4e68f97 100644
--- a/src/noosfero-spb/gov_user/lib/gov_user_plugin/juridical_nature.rb
+++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin/juridical_nature.rb
@@ -1,4 +1,4 @@
-class GovUserPlugin::JuridicalNature < Noosfero::Plugin::ActiveRecord
+class GovUserPlugin::JuridicalNature < ActiveRecord::Base
   self.record_timestamps = false
 
   attr_accessible :name
diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin/public_institution.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin/public_institution.rb
index 846ef5b..31ff39a 100644
--- a/src/noosfero-spb/gov_user/lib/gov_user_plugin/public_institution.rb
+++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin/public_institution.rb
@@ -7,7 +7,7 @@ class GovUserPlugin::PublicInstitution < GovUserPlugin::Institution
 
   validates_format_of(
     :cnpj,
-    :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/,
+    :with => /\A\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}\z/,
     :allow_nil => true, :allow_blank => true
   )
 end
diff --git a/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/governmental_power_test.rb b/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/governmental_power_test.rb
index 2f01d43..7241742 100644
--- a/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/governmental_power_test.rb
+++ b/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/governmental_power_test.rb
@@ -28,6 +28,6 @@ class GovUserPlugin::GovernmentalPowerTest < ActiveSupport::TestCase
       inst_cnpj
     )
 
-    assert_equal gov_power.institutions.public.count, GovUserPlugin::PublicInstitution.count
+    assert_equal gov_power.institutions.is_public.count, GovUserPlugin::PublicInstitution.count
   end
 end
diff --git a/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/juridical_nature_test.rb b/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/juridical_nature_test.rb
index 380f1aa..1593029 100644
--- a/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/juridical_nature_test.rb
+++ b/src/noosfero-spb/gov_user/test/unit/gov_user_plugin/juridical_nature_test.rb
@@ -18,6 +18,6 @@ class GovUserPlugin::JuridicalNatureTest < ActiveSupport::TestCase
     juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
     create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere, "22.333.444/5555-66")
     create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere, "22.333.444/5555-77")
-    assert juridical_nature.institutions.public.count == GovUserPlugin::PublicInstitution.count
+    assert juridical_nature.institutions.is_public.count == GovUserPlugin::PublicInstitution.count
   end
 end
--
libgit2 0.21.2