diff --git a/features/step_definitions/mezuro_steps.rb b/features/step_definitions/mezuro_steps.rb
index f92c289..e0c06e9 100644
--- a/features/step_definitions/mezuro_steps.rb
+++ b/features/step_definitions/mezuro_steps.rb
@@ -33,6 +33,14 @@ Then /^I should see "([^\"]*)" inside an alert$/ do |message|
 	selenium.chooseOkOnNextConfirmation();
 end
 
+Then /^I should see "([^"]*)" in the "([^"]*)" input$/ do |content, labeltext|
+    find_field("#{labeltext}").value.should == content
+end
+
+Then /^I should see "([^"]*)" in the "([^"]*)" button$/ do |content, button_class|
+    find_button("#{button_class}").value.should == content
+end
+
 When /^I have a Mezuro project with the following data$/ do |fields|
   item = {}
   fields.rows_hash.each do |name, value|
diff --git a/plugins/mezuro/features/project.feature b/plugins/mezuro/features/project.feature
index bd1b49d..7f5d4de 100644
--- a/plugins/mezuro/features/project.feature
+++ b/plugins/mezuro/features/project.feature
@@ -30,17 +30,17 @@ Feature: Project
 
 	@selenium 
 	Scenario: I edit a Mezuro project
-		When I have a Mezuro project with the following data
+		Given I have a Mezuro project with the following data
       | name        | Sample Project     |
       | description | Sample Description |
       | community   | mycommunity        |
 		And I am on article "Sample Project"
 		And I should be on /mycommunity/sample-project
-		Then I should see "Sample Project"
-    And I should see "Sample Description"
-    And I should see "Add Repository"
 		When I follow "Edit"
-    # Not complete
+    Then I should see "Sample Project" in the "article_name" input
+    And I should see "Sample Description" in the "article_description" input
+    And I should see "Save" button
+
 		
 #	@selenium
 #	Scenario: I delete a Mezuro project that belongs to me
--
libgit2 0.21.2