diff --git a/features/homepage.feature b/features/homepage.feature
index 1c52dcd..3241ebb 100644
--- a/features/homepage.feature
+++ b/features/homepage.feature
@@ -5,16 +5,16 @@ Feature: Homepage
 
   Scenario: Before signing in
     Given I am at the homepage
-    Then I should see Login
-    And I should see Sign Up
-    And I should see Latest projects
-    And I should see Project
+    Then I should see "Login"
+    And I should see "Sign Up"
+    And I should see "Latest projects"
+    And I should see "Project"
 
   Scenario: Signed in
     Given I am a regular user
     And I am signed in
     And I am at the homepage
-    Then I should see Edit
-    And I should see Logout
-    And I should see Latest projects
-    And I should see Project
\ No newline at end of file
+    Then I should see "Edit"
+    And I should see "Logout"
+    And I should see "Latest projects"
+    And I should see "Project"
\ No newline at end of file
diff --git a/features/project/create.feature b/features/project/create.feature
index 21cbecb..76802e2 100644
--- a/features/project/create.feature
+++ b/features/project/create.feature
@@ -8,7 +8,7 @@ Feature: Project Creation
     Given I am at the All Projects page
     When I click the New Project link
     Then I should be in the Login page
-    And I should see You need to sign in or sign up before continuing.
+    And I should see "You need to sign in or sign up before continuing."
 
   @kalibro_restart
   Scenario: project creation
@@ -18,8 +18,8 @@ Feature: Project Creation
     And I fill the Name field with "Kalibro"
     And I fill the Description field with "Web Service to collect metrics"
     When I press the Save button
-    Then I should see Kalibro
-    And I should see Web Service to collect metrics
+    Then I should see "Kalibro"
+    And I should see "Web Service to collect metrics"
 
   @kalibro_restart
   Scenario: project creation with already taken name
@@ -30,7 +30,7 @@ Feature: Project Creation
     And I fill the Name field with "Kalibro"
     And I fill the Description field with "Web Service to collect metrics"
     When I press the Save button
-    Then I should see There's already
+    Then I should see "There's already"
 
   @kalibro_restart
   Scenario: project creation with blank name
@@ -40,4 +40,4 @@ Feature: Project Creation
     And I fill the Name field with " "
     And I fill the Description field with "Web Service to collect metrics"
     When I press the Save button
-    Then I should see Name can't be blank
\ No newline at end of file
+    Then I should see "Name can't be blank"
\ No newline at end of file
diff --git a/features/project/edition.feature b/features/project/edition.feature
index a0357fa..35e5bd3 100644
--- a/features/project/edition.feature
+++ b/features/project/edition.feature
@@ -27,7 +27,7 @@ Feature: Project
     And I have a sample project
     And I am at the All Projects page
     When I visit the sample project edit page
-    Then I should see You're not allowed to do this operation
+    Then I should see "You're not allowed to do this operation"
 
   @kalibro_restart
   Scenario: Filling up the form
@@ -48,8 +48,8 @@ Feature: Project
     And I fill the Name field with "Kalibro"
     And I fill the Description field with "Web Service to collect metrics"
     When I press the Save button
-    Then I should see Kalibro
-    And I should see Web Service to collect metrics
+    Then I should see "Kalibro"
+    And I should see "Web Service to collect metrics"
 
   @kalibro_restart
   Scenario: With project name already taken
@@ -60,7 +60,7 @@ Feature: Project
     And I am at the sample project edit page
     And I fill the Name field with "Qt-Calculator"
     When I press the Save button
-    Then I should see There's already
+    Then I should see "There's already"
 
   @kalibro_restart
   Scenario: Editing just the description
@@ -70,7 +70,7 @@ Feature: Project
     And I am at the sample project edit page
     And I fill the Description field with "Web Service to collect metrics"
     When I press the Save button
-    And I should see Web Service to collect metrics
+    And I should see "Web Service to collect metrics"
 
   @kalibro_restart
   Scenario: With blank project name
@@ -80,4 +80,4 @@ Feature: Project
     And I am at the sample project edit page
     And I fill the Name field with " "
     When I press the Save button
-    Then I should see Name can't be blank
+    Then I should see "Name can't be blank"
diff --git a/features/project/listing.feature b/features/project/listing.feature
index c12a381..474fe8c 100644
--- a/features/project/listing.feature
+++ b/features/project/listing.feature
@@ -6,9 +6,9 @@ Feature: Project listing
   Scenario: Listing projects
     Given I am at the homepage
     When I click the Project link
-    Then I should see Listing Projects
-    And I should see Name
-    And I should see Description
+    Then I should see "Listing Projects"
+    And I should see "Name"
+    And I should see "Description"
 
   @kalibro_restart
   Scenario: Should list the existing projects
@@ -25,6 +25,6 @@ Feature: Project listing
     And I have a sample project
     And I am at the All Projects page
     When I click the Show link
-    Then I should see Name
-    And I should see Description
+    Then I should see "Name"
+    And I should see "Description"
     And the sample project should be there
\ No newline at end of file
diff --git a/features/step_definitions/homepage_steps.rb b/features/step_definitions/homepage_steps.rb
index c821f6d..32f72d0 100644
--- a/features/step_definitions/homepage_steps.rb
+++ b/features/step_definitions/homepage_steps.rb
@@ -10,6 +10,6 @@ Given(/^I am a regular user$/) do
   @user = FactoryGirl.create(:user)
 end
 
-Then(/^I should see (.+)$/) do |text|
+Then(/^I should see "(.+)"$/) do |text|
   page.should have_content(text)
 end
\ No newline at end of file
diff --git a/features/user_update.feature b/features/user_update.feature
index 642b283..3889f7d 100644
--- a/features/user_update.feature
+++ b/features/user_update.feature
@@ -11,5 +11,5 @@ Feature: User update
     And I fill the Name field with "Rafael Manzo"
     And I fill the Current password field with "password"
     And I press the Update button
-    Then I should see You updated your account successfully
+    Then I should see "You updated your account successfully"
     And my name should have changed to Rafael Manzo
\ No newline at end of file
diff --git a/spec/factories/repositories.rb b/spec/factories/repositories.rb
index d91e775..1c68d03 100644
--- a/spec/factories/repositories.rb
+++ b/spec/factories/repositories.rb
@@ -5,14 +5,14 @@ FactoryGirl.define do
     description "A simple calculator"
     license "GPLv3"
     process_period 1
-    type "SVN"
+    type "SUBVERSION"
     address "svn://svn.code.sf.net/p/qt-calculator/code/trunk"
     configuration_id 1
     project_id 1
     send_email "test@test.com"
   end
 
-  factory :another_repository, class: KalibroEntities::Entities::Repository, parent: :repository do
+  factory :another_repository, class: Repository, parent: :repository do
     id 2
   end
 end
\ No newline at end of file
--
libgit2 0.21.2