diff --git a/app/services/supplier_employees_settings.rb b/app/services/supplier_employees_settings.rb
index 43706c87..2cfb1266 100644
--- a/app/services/supplier_employees_settings.rb
+++ b/app/services/supplier_employees_settings.rb
@@ -133,11 +133,13 @@ class SupplierEmployeesSettings
       set_value = nil
       if method.end_with? '!'
         persist = true
+        set_value = true
         attribute.chop!
       end
       if method.end_with? '?'
         # Always a getter, so no set_value
         attribute.chop!
+        #attribute = attribute.from(7) if attribute.start_with? 'is_not'
         attribute = attribute.from(3) if attribute.start_with? 'is_'
       elsif method.start_with? 'is_not_'
         set_value = false
diff --git a/spec/models/employee_spec.rb b/spec/models/employee_spec.rb
index 3d8cc2af..a49e8ca1 100644
--- a/spec/models/employee_spec.rb
+++ b/spec/models/employee_spec.rb
@@ -13,57 +13,4 @@ describe Employee do
       end
     end
   end
-
-  describe 'settings' do
-    let(:supplier){ build :supplier }
-    let(:employee){ create :employee}
-    before do
-      supplier.add_employee employee
-      employee.enrich_with_settings supplier.settings_for(employee)
-    end
-
-    it 'responds to defaults without full initialization (yes this test is needed)' do
-      Employee.new.manager?.should be false
-    end
-
-    it 'responds to defaults' do
-      employee.manager?.should be false
-      employee.active?.should be true
-      employee.color.should == '#3a87ad'
-    end
-
-    it 'Sets the values non persisted on the supplier' do
-      employee.manager = true
-      supplier.employee_settings_storage[employee.id]['manager'].should be true
-      supplier.reload
-      supplier.employee_settings_storage.should_not be_present
-    end
-
-    it 'persists settings of the supplier on save' do
-      employee.manager = true
-      employee.save
-      supplier.reload
-      supplier.employee_settings_storage[employee.id]['manager'].should be true
-    end
-
-    it 'does not non existant suppliers on save' do
-      employee.manager = true
-      ->{ employee.save }.should_not change{ Supplier.count }
-    end
-
-    it 'sets attributes on the employee if fetched through the supplier' do
-      settings = supplier.settings_for employee
-      settings.is_manager!
-      employee.manager?.should be true
-    end
-
-    it 'Implements settings on employees' do
-      supplier.update employee_settings_storage: {employee.id => { 'manager' => true }}
-      supplier.reload
-      # Without the acessor employees on the supplier, the employee and therefore its settings are not linked to the supplier
-      linked_employee = supplier.employees.find{|e| e.id == employee.id }
-      linked_employee.should be_manager
-    end
-
-  end
 end
diff --git a/spec/services/supplier_employees_settings_spec.rb b/spec/services/supplier_employees_settings_spec.rb
new file mode 100644
index 00000000..a65532eb
--- /dev/null
+++ b/spec/services/supplier_employees_settings_spec.rb
@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe SupplierEmployeesSettings do
+  let(:supplier){ build :supplier }
+  let(:employee){ create :employee}
+  subject {supplier.settings_for(employee)}
+  before do
+    supplier.add_employee employee
+    employee.enrich_with_settings supplier.settings_for(employee)
+  end
+
+
+  context "Settings" do
+
+    describe "method inferring" do
+
+      it "regognizes booleans with questionmarks" do
+        subject.is_manager?.should be false
+      end
+
+    end
+  end
+
+  describe "boolean setting" do
+    it "sets the value with exclamation mark with is_ prefix" do
+      subject.manager.should be false
+      subject.is_manager!
+      subject.manager.should be true
+    end
+
+    it "sets the value with exclamation mark" do
+      subject.manager.should be false
+      subject.manager!
+      subject.manager.should be true
+    end
+  end
+
+  context "Employee context" do
+    it 'responds to defaults without full initialization (yes this test is needed)' do
+      Employee.new.manager?.should be false
+    end
+
+    it 'responds to defaults' do
+      employee.manager?.should be false
+      employee.active?.should be true
+      employee.color.should == '#3a87ad'
+    end
+
+    it 'Sets the values non persisted on the supplier' do
+      employee.manager = true
+      supplier.employee_settings_storage[employee.id]['manager'].should be true
+      supplier.reload
+      supplier.employee_settings_storage.should_not be_present
+    end
+
+    it 'persists settings of the supplier on save' do
+      employee.manager = true
+      employee.save
+      supplier.reload
+      supplier.employee_settings_storage[employee.id]['manager'].should be true
+    end
+
+    it 'does not non existant suppliers on save' do
+      employee.manager = true
+      ->{ employee.save }.should_not change{ Supplier.count }
+    end
+
+    it 'sets attributes on the employee if fetched through the supplier' do
+      settings = supplier.settings_for employee
+      settings.is_manager!
+      employee.manager?.should be true
+    end
+
+    it 'Implements settings on employees' do
+      supplier.update employee_settings_storage: {employee.id => { 'manager' => true }}
+      supplier.reload
+      # Without the acessor employees on the supplier, the employee and therefore its settings are not linked to the supplier
+      linked_employee = supplier.employees.find{|e| e.id == employee.id }
+      linked_employee.should be_manager
+    end
+  end
+end