diff --git a/tests/browser/features/property_smoke.feature b/tests/browser/features/property_smoke.feature
index 449fd80..e273e98 100644
--- a/tests/browser/features/property_smoke.feature
+++ b/tests/browser/features/property_smoke.feature
@@ -1,91 +1,90 @@
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # feature definition for property smoke test
 
 @chrome @firefox @internet_explorer_10 @internet_explorer_11 @smoke
 Feature: Property smoke test
 
   @smoke
   Scenario Outline: Check UI elements
     When I navigate to property <property_id> with resource loader debug mode <debug_mode>
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
     Then Header edit button should be there
       And Label element should be there
       And <label> should be displayed as label
       And <property_id> should be displayed as entity id next to the label
       And Header edit button should be there
       And Description element should be there
       And <description> should be displayed as description
       And Header edit button should be there
       And List of aliases should be <aliases>
       And There should be <num_aliases> aliases in the list
       And Header edit button should be there
       And Property datatype heading should be there
       And Property datatype should display <datatype>
       And Statements heading should be there
       And Statement add button should be there
       And Sitelink heading should not be there
       And Sitelink edit button should not be there
 
   @wikidata.beta.wmflabs.org
   Examples:
     | property_id | label | description | aliases | num_aliases | datatype | debug_mode |
     | P694 | "instance of" | "this item is a concrete object (instance) of this class, category or object group" | "is a", "is an", "rdf:type" | 3 | Item | false |
     | P694 | "instance of" | "this item is a concrete object (instance) of this class, category or object group" | "is a", "is an", "rdf:type" | 3 | Item  | true |
 
   @smoke
   Scenario Outline: Click UI elements
     When I navigate to property <property_id> with resource loader debug mode <debug_mode>
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
       And I click the header edit button
       And I click the header cancel button
     Then Header edit button should be there
       And Statement add button should be there
       And Sitelink edit button should not be there
 
   @wikidata.beta.wmflabs.org
   Examples:
     | property_id | debug_mode |
     | P694 | false |
     | P694 | true  |
 
   @smoke @wikidata.beta.wmflabs.org
   Scenario: Click statement add button
     When I navigate to property id P694
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
       And I click the statement add button
     Then Statement add button should be there
       And Statement cancel button should be there
       And Statement save button should be disabled
       And Statement help field should be there
       And Claim entity selector input element should be there
       And Claim value input element should not be there
       And Rank selector for claim 1 in group 1 should be there
       And Snaktype selector for claim 1 in group 1 should not be there
 
   @smoke @modify_entity
   Scenario: Save statement
     Given I have the following properties with datatype:
       | stringprop | string |
     When I navigate to property handle stringprop
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
       And I click the statement add button
       And I select the claim property stringprop
       And I enter it's a string in the claim value input field
-      And I wait for the statement save button
       And I click the statement save button
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Statement edit button for claim 1 in group 1 should be there
       And Statement name of group 1 should be the label of stringprop
       And Statement string value of claim 1 in group 1 should be it's a string
diff --git a/tests/browser/features/reference.feature b/tests/browser/features/reference.feature
index 8c26ea9..2d2e22d 100644
--- a/tests/browser/features/reference.feature
+++ b/tests/browser/features/reference.feature
@@ -1,236 +1,224 @@
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # feature definition for references
 
 @chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config @wikidata.beta.wmflabs.org
 Feature: Adding references to statements
 
   Background:
     Given I have an item to test
       And I have the following properties with datatype:
         | stringprop | string |
       And I have statements with the following properties and values:
         | stringprop | reference test |
       And I am on the page of the item to test
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
 
   @ui_only
   Scenario: Reference UI has all required elements
+    When I click the statement edit button
     Then Reference add button should be there
-      And Reference cancel button should not be there
-      And Reference save button should not be there
+      And Statement save button should not be there
       And Reference counter should be there
       And Reference counter should show 0
 
   @ui_only
   Scenario: References toggler
     When I click the toggle references link of statement 1
-    Then Reference add button should be hidden
-      And Reference cancel button should not be there
-      And Reference save button should not be there
+    Then Reference add button should not be there
+      And Statement save button should not be there
       And Reference counter should be there
       And Reference counter should show 0
 
   @ui_only
   Scenario: Click the Add Reference button
-    When I click the reference add button
+    When I click the statement edit button
+      And I click the reference add button
     Then Reference add button should be there
-      And Reference save button should be disabled
-      And Reference add snak button should be disabled
+      And Statement save button should be disabled
+      And Reference add snak button should be there
       And Reference remove snak button should be disabled
-      And Reference remove button should not be there
-      And Reference cancel button should be there
+      And Reference remove button should be there
+      And Statement cancel button should be there
       And Snak entity selector input element should be there
       And Snak value input element should not be there
 
   @ui_only
   Scenario Outline: Cancel reference
-    When I click the reference add button
+    When I click the statement edit button
+      And I click the reference add button
       And I <cancel>
+      And I click the statement edit button
     Then Reference add button should be there
       And Reference counter should be there
       And Reference counter should show 0
-      And Reference cancel button should not be there
-      And Reference save button should not be there
+      And Statement cancel button should be there
+      And Statement save button should not be there
       And Reference remove button should not be there
       And Reference add snak button should not be there
       And Reference remove snak button should not be there
 
   Examples:
     | cancel |
-    | click the reference cancel button |
+    | click the statement cancel button |
     | press the ESC key in the snak entity selector input field |
 
   @ui_only
   Scenario: Select a property
-    Given I have the following properties with datatype:
-      | stringprop | string |
-    When I click the reference add button
+    When I click the statement edit button
+      And I click the reference add button
       And I select the snak property stringprop
     Then Reference add button should be there
-      And Reference save button should be disabled
-      And Reference add snak button should be disabled
+      And Statement save button should be disabled
+      And Reference add snak button should be there
       And Reference remove snak button should be disabled
-      And Reference remove button should not be there
-      And Reference cancel button should be there
+      And Reference remove button should be there
+      And Statement cancel button should be there
       And Snak entity selector input element should be there
       And Snak value input element should be there
 
   @ui_only
   Scenario: Select a property and enter a value
-    Given I have the following properties with datatype:
-      | stringprop | string |
-    When I click the reference add button
+    When I click the statement edit button
+      And I click the reference add button
       And I select the snak property stringprop
       And I enter something as string snak value
-      And I wait for the reference save button
     Then Reference add button should be there
       And Reference remove snak button should be disabled
-      And Reference remove button should not be there
-      And Reference save button should be there
+      And Reference remove button should be there
+      And Statement save button should be there
       And Reference add snak button should be there
-      And Reference cancel button should be there
+      And Statement cancel button should be there
       And Snak entity selector input element should be there
       And Snak value input element should be there
 
   @modify_entity @repo_login
   Scenario Outline: Add reference with one snak
-    Given I have the following properties with datatype:
-      | stringprop | string |
-    When I click the reference add button
+    When I click the statement edit button
+      And I click the reference add button
       And I select the snak property stringprop
       And I enter test as string snak value
-      And I wait for the reference save button
       And I <save>
-    Then Reference edit button should be there
-      And Reference add button should be there
-      And Reference save button should not be there
-      And Reference cancel button should not be there
+      And Statement save button should not be there
+      And Statement cancel button should not be there
       And Reference add snak button should not be there
       And Reference remove snak button should not be there
       And Snak entity selector input element should not be there
       And Snak value input element should not be there
       And Property of snak 1 of reference 1 should be linked
       And Property of snak 1 of reference 1 should be label of stringprop
       And Value of snak 1 of reference 1 should be test
       And Reference counter should show 1
   Examples:
     | save |
-    | click the reference save button |
+    | click the statement save button |
     | press the RETURN key in the snak value input field |
 
   @modify_entity @repo_login
   Scenario: Add reference with multiple snaks
     Given I have the following properties with datatype:
         | stringprop1 | string |
         | stringprop2 | string |
         | stringprop3 | string |
       And I add the following reference snaks:
         | stringprop1 | test1 |
         | stringprop2 | test2 |
         | stringprop3 | test3 |
       And I reload the page
       And I click the toggle references link of statement 1
-    Then Reference edit button should be there
-      And Reference add button should be there
-      And Reference save button should not be there
-      And Reference cancel button should not be there
+      And Statement save button should not be there
+      And Statement cancel button should not be there
       And Reference add snak button should not be there
       And Reference remove snak button should not be there
       And Snak entity selector input element should not be there
       And Snak value input element should not be there
       And Property of snak 1 of reference 1 should be linked
       And Property of snak 2 of reference 1 should be linked
       And Property of snak 3 of reference 1 should be linked
       And Property of snak 1 of reference 1 should be label of stringprop1
       And Property of snak 2 of reference 1 should be label of stringprop2
       And Property of snak 3 of reference 1 should be label of stringprop3
       And Value of snak 1 of reference 1 should be test1
       And Value of snak 2 of reference 1 should be test2
       And Value of snak 3 of reference 1 should be test3
       And Reference counter should show 1
 
   @modify_entity @repo_login
   Scenario: Check UI elements when editing reference
     Given I have the following properties with datatype:
         | stringprop | string |
       And I add the following reference snaks:
         | stringprop | test |
-      And I click the reference edit button
-    Then Reference save button should be disabled
-      And Reference cancel button should be there
+      And I click the statement edit button
+    Then Statement save button should be disabled
+      And Statement cancel button should be there
       And Reference remove button should be there
       And Reference remove snak button should be disabled
       And Reference add snak button should be there
       And Reference add button should be there
       And Snak entity selector input element should not be there
       And Snak value input element should be there
 
   @modify_entity @repo_login
   Scenario: Edit reference with one snak
     Given I have the following properties with datatype:
         | stringprop | string |
       And I add the following reference snaks:
         | stringprop | test |
-      And I click the reference edit button
+      And I click the statement edit button
       And I enter modified as string snak value
-      And I click the reference save button
-    Then Reference edit button should be there
-      And Reference add button should be there
-      And Reference save button should not be there
-      And Reference cancel button should not be there
+    And I click the statement save button
+      And Statement save button should not be there
+      And Statement cancel button should not be there
       And Reference add snak button should not be there
       And Reference remove snak button should not be there
       And Snak entity selector input element should not be there
       And Snak value input element should not be there
       And Property of snak 1 of reference 1 should be linked
       And Property of snak 1 of reference 1 should be label of stringprop
       And Value of snak 1 of reference 1 should be modified
       And Reference counter should show 1
 
   @modify_entity @repo_login
   Scenario: Remove complete reference
     Given I have the following properties with datatype:
         | stringprop | string |
       And I add the following reference snaks:
         | stringprop | test |
-      And I click the reference edit button
+      And I click the statement edit button
       And I click the reference remove button
     Then Reference add button should be there
-      And Reference edit button should not be there
-      And Reference cancel button should not be there
-      And Reference save button should not be there
+      And Statement cancel button should be there
+      And Statement save button should be there
       And Reference counter should be there
       And Reference counter should show 0
       And Snak entity selector input element should not be there
       And Snak value input element should not be there
       And Property of snak 1 of reference 1 should not be there
       And Value of snak 1 of reference 1 should not be there
 
   @modify_entity @repo_login
   Scenario: Remove reference snak
     Given I have the following properties with datatype:
         | stringprop1 | string |
         | stringprop2 | string |
       And I add the following reference snaks:
         | stringprop1 | test1 |
         | stringprop2 | test2 |
-      And I click the reference edit button
+      And I click the statement edit button
       And I remove reference snak 1
-      And I click the reference save button
-    Then Reference add button should be there
-      And Reference edit button should be there
-      And Reference cancel button should not be there
-      And Reference save button should not be there
+      And I click the statement save button
+      And Statement cancel button should not be there
+      And Statement save button should not be there
       And Reference counter should be there
       And Reference counter should show 1
       And Snak entity selector input element should not be there
       And Snak value input element should not be there
       And Property of snak 1 of reference 1 should be label of stringprop2
       And Value of snak 1 of reference 1 should be test2
       And Property of snak 2 of reference 1 should not be there
       And Value of snak 2 of reference 1 should not be there
diff --git a/tests/browser/features/statement.feature b/tests/browser/features/statement.feature
index f051ea0..424f13d 100644
--- a/tests/browser/features/statement.feature
+++ b/tests/browser/features/statement.feature
@@ -1,122 +1,119 @@
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # feature definition for statements tests
 
 @chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config @wikidata.beta.wmflabs.org
 Feature: Creating statements
 
   Background:
     Given I am on an item page
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
 
   @ui_only
   Scenario: Statement UI has all required elements
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Rank selector for claim 1 in group 1 should not be there
       And Snaktype selector for claim 1 in group 1 should not be there
 
   @ui_only
   Scenario: Click the add button
     When I click the statement add button
     Then Statement add button should be there
       And Statement cancel button should be there
       And Statement save button should be disabled
       And Statement help field should be there
       And Claim entity selector input element should be there
       And Claim value input element should not be there
       And Rank selector for claim 1 in group 1 should be there
       And Snaktype selector for claim 1 in group 1 should not be there
 
   @ui_only
   Scenario Outline: Cancel statement
     When I click the statement add button
       And I <cancel>
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Rank selector for claim 1 in group 1 should not be there
       And Snaktype selector for claim 1 in group 1 should not be there
 
   Examples:
     | cancel |
     | click the statement cancel button |
     | press the ESC key in the claim entity selector input field |
 
   @repo_login @ui_only
   Scenario: Select a property
     Given I have the following properties with datatype:
       | stringprop | string |
     When I click the statement add button
       And I select the claim property stringprop
     Then Statement add button should be there
       And Statement cancel button should be there
       And Statement save button should be disabled
       And Claim entity selector input element should be there
       And Claim value input element should be there
       And Rank selector for claim 1 in group 1 should be there
       And Snaktype selector for claim 1 in group 1 should be there
 
   @repo_login @smoke @ui_only
   Scenario: Select a property and enter a statement value
     Given I have the following properties with datatype:
       | stringprop | string |
     When I click the statement add button
       And I select the claim property stringprop
       And I enter something in the claim value input field
-      And I wait for the statement save button
     Then Statement add button should be there
       And Statement cancel button should be there
       And Statement save button should be there
       And Claim entity selector input element should be there
       And Claim value input element should be there
       And Rank selector for claim 1 in group 1 should be there
       And Snaktype selector for claim 1 in group 1 should be there
 
   @repo_login @ui_only
   Scenario Outline: Cancel statement after selecting a property
     Given I have the following properties with datatype:
       | stringprop | string |
     When I click the statement add button
       And I select the claim property stringprop
       And I enter something in the claim value input field
-      And I wait for the statement save button
       And I <cancel>
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Rank selector for claim 1 in group 1 should not be there
       And Snaktype selector for claim 1 in group 1 should not be there
 
   Examples:
     | cancel |
     | click the statement cancel button |
     | press the ESC key in the claim value input field |
 
   @repo_login @ui_only
   Scenario: Select a property, enter a statement value and clear the property
     Given I have the following properties with datatype:
       | stringprop | string |
     When I click the statement add button
       And I select the claim property stringprop
       And I enter something in the claim value input field
-      And I wait for the statement save button
       And I enter invalid in the claim property input field
     Then Statement add button should be there
       And Statement cancel button should be there
       And Statement save button should be disabled
       And Claim entity selector input element should be there
       And Claim value input element should not be there
       And Rank selector for claim 1 in group 1 should be there
       And Snaktype selector for claim 1 in group 1 should not be there
diff --git a/tests/browser/features/statements_string.feature b/tests/browser/features/statements_string.feature
index c649578..a871c17 100644
--- a/tests/browser/features/statements_string.feature
+++ b/tests/browser/features/statements_string.feature
@@ -1,66 +1,64 @@
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # feature definition for string type statements tests
 
 @chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config @wikidata.beta.wmflabs.org
 Feature: Creating statements of type string
 
   Background:
     Given I am on an item page
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
 
   @repo_login @modify_entity
   Scenario Outline: Adding a statement of type string
     Given I have the following properties with datatype:
       | stringprop | string |
     When I click the statement add button
       And I select the claim property stringprop
       And I enter <value> in the claim value input field
-      And I wait for the statement save button
       And I <save>
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Statement edit button for claim 1 in group 1 should be there
       And Statement name of group 1 should be the label of stringprop
       And Statement string value of claim 1 in group 1 should be <value>
 
   Examples:
     | value                               | save                                                    |
     | it's a string                       | press the RETURN key in the claim value input field |
     | <script>$('body').empty();</script> | click the statement save button                         |
 
   @modify_entity @repo_login
   Scenario: Adding a statement of type string and reload page
     Given I have the following properties with datatype:
       | stringprop | string |
     When I click the statement add button
       And I select the claim property stringprop
       And I enter it's a string in the claim value input field
-      And I wait for the statement save button
       And I click the statement save button
       And I reload the page
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Statement edit button for claim 1 in group 1 should be there
       And Statement name of group 1 should be the label of stringprop
       And Statement string value of claim 1 in group 1 should be it's a string
 
   @modify_entity @repo_logi
   Scenario: Adding a statement of type string with a too long string
     Given I have the following properties with datatype:
       | stringprop | string |
     When I click the statement add button
       And I select the claim property stringprop
       And I enter a too long string as claim value
       And I click the statement save button
     Then An error message should be displayed
diff --git a/tests/browser/features/statements_url.feature b/tests/browser/features/statements_url.feature
index 243c57c..49045f4 100644
--- a/tests/browser/features/statements_url.feature
+++ b/tests/browser/features/statements_url.feature
@@ -1,117 +1,113 @@
 # Wikidata UI tests
 #
 # Author:: Christoph Fischer (christoph.fischer@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # feature definition for url type statements tests
 
 @chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config @wikidata.beta.wmflabs.org
 Feature: Using url properties in statements
 
   Background:
     Given I have the following properties with datatype:
       | urlprop | url |
       And I am not logged in to the repo
 
   @repo_login
   Scenario Outline: Check UI for invalid values
     Given I am on an item page
       And The copyright warning has been dismissed
       And Anonymous edit warnings are disabled
     When I click the statement add button
       And I select the claim property urlprop
       And I enter <value> in the claim value input field
       And I click the statement save button
     Then Statement save button should be there
       And Statement cancel button should be there
       And An error message should be displayed
 
   Examples:
     | value |
     | this is no url |
     | missing.http.org |
 
   @repo_login @modify_entity
   Scenario Outline: Adding a statement of type url
     Given I am logged in to the repo
       And I am on an item page
       And The copyright warning has been dismissed
     When I click the statement add button
       And I select the claim property urlprop
       And I enter http://wikidata.org/ in the claim value input field
-      And I wait for the statement save button
       And I <save>
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Statement edit button for claim 1 in group 1 should be there
       And Statement link text of claim 1 in group 1 should be http://wikidata.org/
 
   Examples:
     | save |
     | press the RETURN key in the claim value input field |
     | click the statement save button |
 
   @repo_login @modify_entity
   Scenario Outline: Save a statement of type url and check the output
     Given I am logged in to the repo
     And I am on an item page
     And The copyright warning has been dismissed
     When I click the statement add button
     And I select the claim property urlprop
     And I enter <value> in the claim value input field
-    And I wait for the statement save button
     And I click the statement save button
     Then Statement save button should not be there
     And Statement cancel button should not be there
     And Statement edit button for claim 1 in group 1 should be there
     And Statement name of group 1 should be the label of urlprop
     And Statement link element of claim 1 in group 1 should be there
     And Statement link text of claim 1 in group 1 should be <value>
 
   Examples:
     | value |
     | ftp://ftp-stud.hs-esslingen.de/pub |
     | irc://irc.freenode.net/ |
     | mailto:mail@example.com |
     | http://عربي.امارات/en/ |
 
   @repo_login @modify_entity
   Scenario: Save a statement of type url and check the link href
     Given I am logged in to the repo
       And I am on an item page
       And The copyright warning has been dismissed
     When I click the statement add button
       And I select the claim property urlprop
       And I enter http://www.wikimedia.de in the claim value input field
-      And I wait for the statement save button
       And I click the statement save button
     Then Statement save button should not be there
       And Statement cancel button should not be there
       And Statement edit button for claim 1 in group 1 should be there
       And Statement name of group 1 should be the label of urlprop
       And Statement link element of claim 1 in group 1 should be there
       And Statement link text of claim 1 in group 1 should be http://www.wikimedia.de
       And Statement link url of claim 1 in group 1 should be http://www.wikimedia.de/
 
   @repo_login @modify_entity
   Scenario: Adding a statement of type url and reload page
     Given I am logged in to the repo
       And I am on an item page
       And The copyright warning has been dismissed
     When I click the statement add button
       And I select the claim property urlprop
       And I enter http://wikidata.org/ in the claim value input field
-      And I wait for the statement save button
       And I click the statement save button
       And I reload the page
     Then Statement add button should be there
       And Statement cancel button should not be there
       And Statement save button should not be there
       And Claim entity selector input element should not be there
       And Claim value input element should not be there
       And Statement edit button for claim 1 in group 1 should be there
       And Statement name of group 1 should be the label of urlprop
       And Statement link text of claim 1 in group 1 should be http://wikidata.org/
diff --git a/tests/browser/features/step_definitions/reference_steps.rb b/tests/browser/features/step_definitions/reference_steps.rb
index 5f9cbba..06df540 100644
--- a/tests/browser/features/step_definitions/reference_steps.rb
+++ b/tests/browser/features/step_definitions/reference_steps.rb
@@ -1,180 +1,116 @@
 # -*- encoding : utf-8 -*-
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # steps for references
 
 When(/^I click the reference add button$/) do
   on(ItemPage).add_reference_element.when_visible.click
 end
 
-When(/^I click the reference cancel button$/) do
-  on(ItemPage).cancel_reference_element.when_visible.click
-end
-
-When(/^I click the reference edit button$/) do
-  on(ItemPage) do |page|
-    page.edit_reference_element.when_visible.click
-    page.ajax_wait
-  end
-end
-
-When(/^I click the reference save button$/) do
-  on(ItemPage) do |page|
-    page.save_reference_element.when_visible.click
-    page.ajax_wait
-    page.wait_for_statement_request_finished
-  end
-end
-
 When(/^I click the reference remove button$/) do
   on(ItemPage) do |page|
     page.remove_reference_element.when_visible.click
     page.ajax_wait
     page.wait_for_statement_request_finished
   end
 end
 
 When(/^I remove reference snak (\d+)$/) do |snak_index|
-  on(ItemPage).remove_reference_snak(snak_index).click
+  on(ItemPage).remove_reference_snak(snak_index).when_visible.click
 end
 
-When(/^I wait for the reference save button$/) do
-  on(ItemPage).wait_for_reference_save_button
-end
-
-When(/^I add the following reference snaks:$/) do |table|
+When /^I add the following reference snaks:$/ do |table|
+  step 'I click the statement edit button'
   on(ItemPage).add_reference_snaks(table.raw, @properties)
+  step 'I click the statement save button'
 end
 
 When(/^I click the toggle references link of statement (\d+)$/) do |statement_index|
   on(ItemPage) do |page|
-    page.toggle_references(statement_index).click
+    page.toggle_references(statement_index).when_visible.click
     page.wait_until_jquery_animation_finished
   end
 end
 
 Then(/^Reference add button should be there$/) do
-  on(ItemPage).add_reference_element.when_visible
+  expect(on(ItemPage).add_reference_element.when_visible).to be_visible
 end
 
 Then(/^Reference add button should not be there$/) do
-  on(ItemPage).add_reference_element.when_not_visible
-end
-
-Then(/^Reference add button should be hidden$/) do
-  on(ItemPage).add_reference_element.when_not_visible
+  expect(on(ItemPage).add_reference_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Reference add button should be disabled$/) do
-  on(ItemPage).add_reference_element.when_not_visible
-  on(ItemPage).add_reference_disabled_element.when_visible
-end
-
-Then(/^Reference cancel button should be there$/) do
-  on(ItemPage).cancel_reference_element.when_visible
-end
-
-Then(/^Reference cancel button should not be there$/) do
-  on(ItemPage).cancel_reference_element.when_not_visible
-end
-
-Then(/^Reference cancel button should be disabled$/) do
-  on(ItemPage).cancel_reference_element.when_not_visible
-  on(ItemPage).cancel_reference_disabled_element.when_visible
-end
-
-Then(/^Reference edit button should be there$/) do
-  on(ItemPage).edit_reference_element.when_visible
-end
-
-Then(/^Reference edit button should not be there$/) do
-  on(ItemPage).edit_reference_element.when_not_visible
-end
-
-Then(/^Reference edit button should be disabled$/) do
-  on(ItemPage).edit_reference_element.when_not_visible
-  on(ItemPage).edit_reference_disabled_element.when_visible
-end
-
-Then(/^Reference save button should be there$/) do
-  on(ItemPage).save_reference_element.when_visible
-end
-
-Then(/^Reference save button should not be there$/) do
-  on(ItemPage).save_reference_element.when_not_visible
-end
-
-Then(/^Reference save button should be disabled$/) do
-  on(ItemPage).save_reference_element.when_not_visible
-  on(ItemPage).save_reference_disabled_element.when_visible
+  expect(on(ItemPage).add_reference_element.when_not_visible).not_to be_visible
+  expect(on(ItemPage).add_reference_disabled_element.when_visible).to be_visible
 end
 
 Then(/^Reference remove button should be there$/) do
-  on(ItemPage).remove_reference_element.when_visible
+  expect(on(ItemPage).remove_reference_element.when_visible).to be_visible
 end
 
 Then(/^Reference remove button should not be there$/) do
-  on(ItemPage).remove_reference_element.when_not_visible
+  expect(on(ItemPage).remove_reference_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Reference remove button should be disabled$/) do
-  on(ItemPage).remove_reference_element.when_not_visible
-  on(ItemPage).remove_reference_disabled_element.when_visible
+  expect(on(ItemPage).remove_reference_element.when_not_visible).not_to be_visible
+  expect(on(ItemPage).remove_reference_disabled_element.when_visible).to be_visible
 end
 
 Then(/^Reference remove snak button should be there$/) do
-  expect(on(ItemPage).remove_reference_snak.present?).to be true
+  expect(on(ItemPage).remove_reference_snak.when_present).to be_present
 end
 
 Then(/^Reference remove snak button should not be there$/) do
-  expect(on(ItemPage).remove_reference_snak.present?).to be false
+  expect(on(ItemPage).remove_reference_snak.when_not_present).not_to be_present
 end
 
 Then(/^Reference remove snak button should be disabled$/) do
-  expect(on(ItemPage).remove_reference_snak.present?).to be false
-  expect(on(ItemPage).remove_reference_snak_disabled.present?).to be true
+  expect(on(ItemPage).remove_reference_snak.when_not_present).not_to be_present
+  expect(on(ItemPage).remove_reference_snak_disabled.when_present).to be_present
 end
 
 Then(/^Reference add snak button should be there$/) do
-  on(ItemPage).add_reference_snak_element.when_visible
+  expect(on(ItemPage).add_reference_snak_element.when_visible).to be_visible
 end
 
 Then(/^Reference add snak button should not be there$/) do
-  on(ItemPage).add_reference_snak_element.when_not_visible
+  expect(on(ItemPage).add_reference_snak_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Reference add snak button should be disabled$/) do
-  on(ItemPage).add_reference_snak_element.when_not_visible
-  on(ItemPage).add_reference_snak_disabled_element.when_visible
+  expect(on(ItemPage).add_reference_snak_element.when_not_visible).not_to be_visible
+  expect(on(ItemPage).add_reference_snak_disabled_element.when_visible).to be_visible
 end
 
 Then(/^Reference counter should be there$/) do
-  on(ItemPage).reference_counter_element.when_visible
+  expect(on(ItemPage).reference_counter_element.when_visible).to be_visible
 end
 
 Then(/^Reference counter should show (.+)$/) do |value|
   expect(on(ItemPage).number_of_references_from_counter).to be == value
 end
 
 Then(/^Property of snak (\d+) of reference (\d+) should be label of (.+)$/) do |snak_index, reference_index, property_handle|
-  expect(on(ItemPage).reference_snak_property(reference_index, snak_index).text).to be == @properties[property_handle]['label']
+  expect(on(ItemPage).reference_snak_property(reference_index, snak_index).when_visible.text).to be == @properties[property_handle]['label']
 end
 
 Then(/^Property of snak (\d+) of reference (\d+) should not be there$/) do |snak_index, reference_index|
-  expect(on(ItemPage).reference_snak_property(reference_index, snak_index).present?).to be false
+  expect(on(ItemPage).reference_snak_property(reference_index, snak_index).when_not_present).not_to be_present
 end
 
 Then(/^Property of snak (\d+) of reference (\d+) should be linked$/) do |snak_index, reference_index|
-  expect(on(ItemPage).reference_snak_property_link(reference_index, snak_index).present?).to be true
+  expect(on(ItemPage).reference_snak_property_link(reference_index, snak_index).when_present).to be_present
 end
 
 Then(/^Value of snak (\d+) of reference (\d+) should be (.+)$/) do |snak_index, reference_index, value|
-  expect(on(ItemPage).reference_snak_value(reference_index, snak_index).text).to be == value
+  expect(on(ItemPage).reference_snak_value(reference_index, snak_index).when_visible.text).to be == value
 end
 
 Then(/^Value of snak (\d+) of reference (\d+) should not be there$/) do |snak_index, reference_index|
-  expect(on(ItemPage).reference_snak_value(reference_index, snak_index).present?).to be false
+  expect(on(ItemPage).reference_snak_value(reference_index, snak_index).when_not_present).not_to be_present
 end
diff --git a/tests/browser/features/step_definitions/statement_steps.rb b/tests/browser/features/step_definitions/statement_steps.rb
index d53c36f..ef7db2f 100644
--- a/tests/browser/features/step_definitions/statement_steps.rb
+++ b/tests/browser/features/step_definitions/statement_steps.rb
@@ -1,290 +1,286 @@
 # -*- encoding : utf-8 -*-
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # tests for statements
 
 When(/^I have statements with the following properties and values:$/) do |statements|
   wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
   wb_api.log_in(ENV['WB_REPO_USERNAME'], ENV['WB_REPO_PASSWORD'])
   statements.raw.each do |statement|
     property_handle = statement[0]
     value = on(ItemPage).get_string_snak_value(statement[1])
     wb_api.create_claim(@item_under_test['id'], 'value', @properties[property_handle]['id'], value)
   end
 end
 
 When /^I click the statement add button$/ do
   on(ItemPage).add_statement_element.when_visible.click
 end
 
 When /^I click the statement edit button$/ do
   on(ItemPage).edit_statement_element.when_visible.click
 end
 
 When /^I click the statement cancel button$/ do
   on(ItemPage).cancel_statement_element.when_visible.click
 end
 
 When(/^I click the statement save button$/) do
   on(ItemPage) do |page|
     page.save_statement_element.when_visible.click
     page.ajax_wait
     page.wait_for_statement_request_finished
   end
 end
 
 When(/^I select the claim property (.+)$/) do |handle|
   on(ItemPage) do |page|
     page.select_claim_property(@properties[handle]['label'])
     page.wait_for_claim_value_box
   end
 end
 
 When(/^I select the snak property (.+)$/) do |handle|
   on(ItemPage) do |page|
     page.select_snak_property(@properties[handle]['label'])
     page.wait_for_snak_value_box
   end
 end
 
 When(/^I enter (.+) in the claim property input field$/) do |value|
   on(ItemPage) do |page|
     page.claim_entity_selector_input_element.when_visible.click
     page.claim_entity_selector_input = value
     page.ajax_wait
   end
 end
 
 When(/^I enter (.+) in the claim value input field$/) do |value|
   on(ItemPage) do |page|
     page.claim_value_input_field_element.when_visible.click
     page.claim_value_input_field = value
     page.ajax_wait
   end
 end
 
 When(/^I enter (.+) in the InputExtender input field$/) do |value|
   on(ItemPage) do |page|
     page.inputextender_input_element.when_visible.click
     page.inputextender_input = value
     page.ajax_wait
   end
 end
 
 When(/^I click the InputExtender dropdown first element$/) do
   on(ItemPage).inputextender_dropdown_first_element.when_visible.click
   on(ItemPage).ajax_wait
 end
 
 When(/^I enter (.+) as string snak value$/) do |value|
   on(ItemPage) do |page|
     page.snak_value_input_field.when_visible.clear
     page.snak_value_input_field.when_visible.send_keys value
     page.ajax_wait
   end
 end
 
 When(/^I enter the label of item (.+) as claim value$/) do |handle|
   step "I enter #{@items[handle]['label']} in the claim value input field"
 end
 
 When(/^I enter a too long string as claim value$/) do
   step 'I enter looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong in the claim value input field'
 end
 
 When(/^I enter the label of item (.+) as snak value$/) do |handle|
   step "I enter #{@items[handle]['label']} as string snak value"
 end
 
 When(/^I enter a too long string as snak value$/) do
   step 'I enter looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong as string snak value'
 end
 
 When(/^I press the ESC key in the claim value input field$/) do
   on(ItemPage).claim_value_input_field_element.when_visible.send_keys :escape
 end
 
 When(/^I press the ARROWDOWN key in the claim value input field$/) do
   on(ItemPage).claim_value_input_field_element.when_visible.send_keys :arrow_down
 end
 
 When(/^I press the ESC key in the snak value input field$/) do
   on(ItemPage).snak_value_input_field.when_visible.send_keys :escape
 end
 
 When(/^I press the RETURN key in the claim value input field$/) do
   on(ItemPage) do |page|
     page.claim_value_input_field_element.when_visible.send_keys :enter
     page.ajax_wait
     page.wait_for_statement_request_finished
   end
 end
 
 When(/^I press the RETURN key in the snak value input field$/) do
   on(ItemPage) do |page|
     page.snak_value_input_field.when_visible.send_keys :enter
     page.ajax_wait
     page.wait_for_statement_request_finished
   end
 end
 
-When(/^I wait for the statement save button$/) do
-  on(ItemPage).wait_for_statement_save_button
-end
-
 When(/^I edit claim (\d+) in group (\d+)$/) do |claim_index, group_index|
   on(ItemPage) do |page|
     page.edit_claim_element(group_index, claim_index).when_visible.click
     page.ajax_wait
   end
 end
 
 When(/^I memorize the value of the the claim value input field$/) do
   @memorized_label = on(ItemPage).claim_value_input_field_element.when_visible.value
 end
 
 Then(/^Statements heading should be there$/) do
   expect(on(ItemPage).statements_heading_element.when_visible).to be_visible
 end
 
 Then(/^Statements heading should not be there$/) do
   expect(on(ItemPage).statements_heading_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Statement help field should be there$/) do
   expect(on(ItemPage).statement_help_field_element.when_visible).to be_visible
 end
 
 Then(/^Statement add button should be there$/) do
   expect(on(ItemPage).add_statement_element.when_visible).to be_visible
 end
 
 Then(/^Statement add button should not be there$/) do
   expect(on(ItemPage).add_statement_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Statement edit button for claim (.+) in group (.+) should be there$/) do |claim_index, group_index|
   expect(on(ItemPage).edit_claim_element(group_index, claim_index).when_present).to be_present
 end
 
 Then(/^Statement add button for group (.+) should be there$/) do |group_index|
   expect(on(ItemPage).add_claim_element(group_index).when_present).to be_present
 end
 
 Then(/^Statement save button should be there$/) do
   expect(on(ItemPage).save_statement_element.when_visible).to be_visible
 end
 
 Then(/^Statement save button should not be there$/) do
   expect(on(ItemPage).save_statement_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Statement save button should be disabled$/) do
   on(ItemPage) do |page|
     expect(page.save_statement_element.when_not_visible).not_to be_visible
     expect(page.save_statement_disabled_element.when_visible).to be_visible
   end
 end
 
 Then(/^Statement cancel button should be there$/) do
   expect(on(ItemPage).cancel_statement_element.when_visible).to be_visible
 end
 
 Then(/^Statement cancel button should not be there$/) do
   expect(on(ItemPage).cancel_statement_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Claim value input element should be there$/) do
   expect(on(ItemPage).claim_value_input_field_element.when_visible).to be_visible
 end
 
 Then(/^Claim value input element should not be there$/) do
   expect(on(ItemPage).claim_value_input_field_element.when_not_visible).not_to be_visible
 end
 
 Then(/^Snak value input element should be there$/) do
   expect(on(ItemPage).snak_value_input_field.when_visible).to be_visible
 end
 
 Then(/^Snak value input element should not be there$/) do
   expect(on(ItemPage).snak_value_input_field.when_not_visible).not_to be_visible
 end
 
 Then(/^Statement name of group (.+) should be the label of (.+)$/) do |group_index, handle|
   expect(on(ItemPage).statement_name_element(group_index).when_visible.text).to eq @properties[handle]['label']
 end
 
 Then(/^Statement string value of claim (.+) in group (.+) should be (.+)$/) do |claim_index, group_index, value|
   expect(on(ItemPage).claim_value_string(group_index, claim_index).when_visible.text).to eq value
 end
 
 Then(/^Statement value of claim (.+) in group (.+) should be the label of item (.+)$/) do |claim_index, group_index, handle|
   expect(on(ItemPage).claim_value_link(group_index, claim_index).when_visible.text).to eq @items[handle]['label']
 end
 
 Then(/^Statement value of claim (.+) in group (.+) should be what I memorized$/) do |claim_index, group_index|
   expect(on(ItemPage).claim_value_link(group_index, claim_index).when_visible.text).to eq @memorized_label
 end
 
 Then(/^Snaktype (.+) should be shown for claim (\d+) in group (\d+)$/) do |snaktype, claim_index, group_index|
   expect(on(ItemPage).claim_snaktype(group_index, claim_index, snaktype).when_present).to be_present
 end
 
 Then(/^Statement link element of claim (.+) in group (.+) should be there$/) do |claim_index, group_index|
   expect(on(ItemPage).claim_value_link(group_index, claim_index).when_present).to be_present
 end
 
 Then(/^Statement link text of claim (.+) in group (.+) should be (.+)$/) do |claim_index, group_index, value|
   expect(on(ItemPage).claim_value_link(group_index, claim_index).when_visible.text).to eq value
 end
 
 Then(/^Statement link url of claim (.+) in group (.+) should be (.+)$/) do |claim_index, group_index, value|
   expect(on(ItemPage).claim_value_link(group_index, claim_index).when_visible.attribute('href')).to eq value
 end
 
 When(/^I click the InputExtender toggler link$/) do
   on(ItemPage).inputextender_toggler_element.when_visible.click
 end
 
 Then(/^(.*) should be displayed in the InputExtender preview$/) do |preview|
   expect(on(ItemPage).inputextender_preview_element.when_present.text).to eq preview
 end
 
 Then(/^(.*) should be the time precision setting$/) do |precision|
   expect(on(ItemPage).time_precision_element.when_present.text).to eq precision
 end
 
 Then(/^(.*) should be the time calendar setting$/) do |calendar|
   expect(on(ItemPage).time_calendar_element.when_present.text).to eq calendar
 end
 
 Then(/^Time precision chooser should be there$/) do
   expect(on(ItemPage).time_precision_element.when_visible).to be_visible
 end
 
 Then(/^Time calendar chooser should be there$/) do
   expect(on(ItemPage).time_calendar_element.when_visible).to be_visible
 end
 
 Then(/^InputExtender preview should be there$/) do
   expect(on(ItemPage).inputextender_preview_element.when_visible).to be_visible
 end
 
 Then(/^InputExtender input should be there$/) do
   expect(on(ItemPage).inputextender_input_element.when_visible).to be_visible
 end
 
 Then(/^Geo precision chooser should be there$/) do
   expect(on(ItemPage).geo_precision_element.when_visible).to be_visible
 end
 
 Then(/^(.*) should be the geo precision setting$/) do |precision|
   expect(on(ItemPage).geo_precision_element.when_present.text).to eq precision
 end
 
 Then(/^InputExtender dropdown should be there$/) do
   expect(on(ItemPage).inputextender_dropdown_element.when_visible).to be_visible
 end
diff --git a/tests/browser/features/support/modules/reference_module.rb b/tests/browser/features/support/modules/reference_module.rb
index 6301982..8a1d39a 100644
--- a/tests/browser/features/support/modules/reference_module.rb
+++ b/tests/browser/features/support/modules/reference_module.rb
@@ -1,80 +1,71 @@
 # -*- encoding : utf-8 -*-
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # module for reference page object
 
 module ReferencePage
   include PageObject
   # references UI elements
   a(:add_reference, css: 'div.wikibase-statementview-references > div.wikibase-addtoolbar-container span.wikibase-toolbar-button-add:not(.wikibase-toolbarbutton-disabled) > a')
   a(:add_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-add.wikibase-toolbarbutton-disabled > a')
-  a(:save_reference, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-save:not(.wikibase-toolbarbutton-disabled) > a')
-  a(:save_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-save.wikibase-toolbarbutton-disabled > a')
-  a(:cancel_reference, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-cancel:not(.wikibase-toolbarbutton-disabled) > a')
-  a(:cancel_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-cancel.wikibase-toolbarbutton-disabled > a')
-  a(:edit_reference, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-edit:not(.wikibase-toolbarbutton-disabled) > a')
-  a(:edit_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-edit.wikibase-toolbarbutton-disabled > a')
-  a(:remove_reference, css: 'div.wikibase-statementview-references .wikibase-edittoolbar-container span.wikibase-toolbar-button-remove:not(.wikibase-toolbarbutton-disabled) > a')
-  a(:remove_reference_disabled, css: 'div.wikibase-statementview-references .wikibase-edittoolbar-container span.wikibase-toolbar-button-remove.wikibase-toolbarbutton-disabled > a')
+  a(:remove_reference, css: 'div.wikibase-statementview-references .wikibase-removetoolbar-container span.wikibase-toolbar-button-remove:not(.wikibase-toolbarbutton-disabled) > a')
+  a(:remove_reference_disabled, css: 'div.wikibase-statementview-references .wikibase-removetoolbar-container span.wikibase-toolbar-button-remove.wikibase-toolbarbutton-disabled > a')
   a(:add_reference_snak, css: 'div.wikibase-statementview-references div.wikibase-referenceview span.wikibase-toolbar-button-add:not(.wikibase-toolbarbutton-disabled) > a')
   a(:add_reference_snak_disabled, css: 'div.wikibase-statementview-references div.wikibase-referenceview span.wikibase-toolbar-button-add.wikibase-toolbarbutton-disabled > a')
   span(:reference_counter, css: 'div.wikibase-statementview-references-heading span.ui-toggler-label')
 
   def remove_reference_snak(snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove:not(.wikibase-toolbarbutton-disabled) > a")
+    element('a', css: "div.wikibase-statementview-references div.wikibase-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove:not(.wikibase-toolbarbutton-disabled) > a")
   end
 
   def remove_reference_snak_disabled(snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove.wikibase-toolbarbutton-disabled > a")
+    element('a', css: "div.wikibase-statementview-references div.wikibase-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove.wikibase-toolbarbutton-disabled > a")
   end
 
   def reference_snak_property(reference_index = 1, snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property")
+    element('div', css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property")
   end
 
   def reference_snak_property_link(reference_index = 1, snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property a")
+    element('a', css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property a")
   end
 
   def reference_snak_value(reference_index = 1, snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-value")
+    element('div', css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-value")
   end
 
   def toggle_references(statement_index = 1)
-    @browser.element(css: "div.wikibase-statementview:nth-child(#{statement_index}) div.wikibase-statementview-references-heading a.ui-toggler")
+    element('a', css: "div.wikibase-statementview:nth-child(#{statement_index}) div.wikibase-statementview-references-heading a.ui-toggler")
   end
 
   def number_of_references_from_counter
     scanned = reference_counter.scan(/([^ ]+)/)
     scanned[0][0]
   end
 
   def wait_for_reference_save_button
     save_reference_element.when_visible
   end
 
   def add_reference_snaks(snaks, properties)
     index = 1
     add_reference
     snaks.each do |snak|
-      if add_reference_snak?
+      if index > 1
         add_reference_snak
       end
       property_handle = snak[0]
       value = snak[1]
       snak_entity_selector_input(index).when_visible.clear
       snak_entity_selector_input(index).send_keys properties[property_handle]['label']
       ajax_wait
       snak_value_input_field(index).when_visible.clear
       snak_value_input_field(index).send_keys value
       ajax_wait
       index += 1
     end
-    save_reference
-    ajax_wait
-    wait_for_statement_request_finished
   end
 end
diff --git a/tests/browser/features/support/modules/statement_module.rb b/tests/browser/features/support/modules/statement_module.rb
index f1252e6..f764767 100644
--- a/tests/browser/features/support/modules/statement_module.rb
+++ b/tests/browser/features/support/modules/statement_module.rb
@@ -1,93 +1,95 @@
 # -*- encoding : utf-8 -*-
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # module for statement page
 
 module StatementPage
   include PageObject
   include EntitySelectorPage
   include ReferencePage
   include RankSelectorPage
   include SnaktypeSelectorPage
 
   # statements UI elements
   span(:statements_heading, id: 'claims')
   a(:add_statement, css: 'div.wikibase-statementgrouplistview > .wikibase-addtoolbar-container span.wikibase-toolbar-button-add:not(.wikibase-toolbarbutton-disabled) > a')
   a(:add_statement_disabled, css: 'div.wikibase-statementgrouplistview > .wikibase-addtoolbar-container span.wikibase-toolbar-button-add.wikibase-toolbarbutton-disabled > a')
+  a(:edit_statement, css: '.wikibase-statementlistview div.listview-item  .wikibase-edittoolbar-container span.wikibase-toolbar-button-edit:not(.wikibase-toolbarbutton-disabled) > a')
+  a(:edit_statement_disabled, css: '.wikibase-statementlistview div.listview-item  .wikibase-edittoolbar-container span.wikibase-toolbar-button-edit.wikibase-toolbarbutton-disabled > a')
   a(:save_statement, css: '.wikibase-statementlistview div.listview-item span.wikibase-toolbar-button-save:not(.wikibase-toolbarbutton-disabled) > a')
   a(:save_statement_disabled, css: '.wikibase-statementlistview div.listview-item span.wikibase-toolbar-button-save.wikibase-toolbarbutton-disabled > a')
   a(:cancel_statement, css: '.wikibase-statementlistview div.listview-item span.wikibase-toolbar-button-cancel:not(.wikibase-toolbarbutton-disabled) > a')
   a(:cancel_statement_disabled, css: '.wikibase-statementlistview div.listview-item span.wikibase-toolbar-button-cancel.wikibase-toolbarbutton-disabled > a')
   span(:statement_help_field, css: 'div.wikibase-statementlistview span.mw-help-field-hint')
   div(:claim_edit_mode, css: '.wb-claim-section div.wb-edit')
   textarea(:claim_value_input_field, css: 'div.wikibase-statementview-mainsnak .valueview-input')
 
   div(:inputextender_preview, css: 'div.ui-inputextender-extension > div.ui-preview > div.ui-preview-value')
   text_field(:inputextender_input, css: 'div.ui-inputextender-extension > input')
   a(:inputextender_toggler, css: 'div.ui-inputextender-extension > a.valueview-expertextender-advancedtoggler')
   span(:time_hint, css: 'div.ui-inputextender-extension > div.valueview-expertextender-calendarhint > span')
   a(:time_precision, css: 'div.ui-inputextender-extension div.valueview-expert-TimeInput-precision > a.ui-listrotator-curr')
   a(:time_calendar, css: 'div.ui-inputextender-extension div.valueview-expert-TimeInput-calendar > a.ui-listrotator-curr')
   a(:geo_precision, css: 'div.ui-inputextender-extension div.valueview-expert-GlobeCoordinateInput-precision > a.ui-listrotator-curr')
 
   ul(:inputextender_dropdown, css: 'ul.ui-suggester-list:not(.ui-entityselector-list):not(.wikibase-siteselector-list)')
   li(:inputextender_dropdown_first, css: 'ul.ui-suggester-list:not(.ui-entityselector-list):not(.wikibase-siteselector-list) li')
 
   # methods
   def statement_name_element(group_index)
     element('div', css: ".wikibase-statementgroupview:nth-child(#{group_index}) div.wikibase-statementgroupview-property-label")
   end
 
   def claim_value_string(group_index, claim_index)
     element('div', css: ".wikibase-statementgroupview:nth-child(#{group_index}) div.listview-item:nth-child(#{claim_index}) div.wikibase-snakview-value")
   end
 
   def claim_value_link(group_index, claim_index)
     element('a', css: ".wikibase-statementgroupview:nth-child(#{group_index}) div.listview-item:nth-child(#{claim_index}) div.wikibase-snakview-value a")
   end
 
   def claim_snaktype(group_index, claim_index, snaktype)
     element('div', css: ".wikibase-statementgroupview:nth-child(#{group_index}) div.listview-item:nth-child(#{claim_index}) div.wikibase-snakview-value.wikibase-snakview-variation-#{snaktype}snak")
   end
 
   def snak_value_input_field(index = 1)
     element('textarea', css: "div.wikibase-snaklistview:nth-child(#{index}) .valueview-input")
   end
 
   def edit_claim_element(group_index, claim_index)
     element('a', css: "div.wikibase-statementgrouplistview div.wikibase-statementgroupview:nth-child(#{group_index}) div.wikibase-statementview:nth-child(#{claim_index}) > .wikibase-edittoolbar-container span.wikibase-toolbar-button-edit:not(.wikibase-toolbarbutton-disabled) > a")
   end
 
   def add_claim_element(group_index)
     element('a', css: "div.wikibase-statementgrouplistview div.wikibase-statementgroupview:nth-child(#{group_index}) > div > span.wikibase-toolbar-wrapper .wikibase-addtoolbar-container span.wikibase-toolbar-button-add:not(.wikibase-toolbarbutton-disabled) > a")
   end
 
   def wait_for_claim_value_box
     wait_until do
       self.claim_value_input_field?
     end
   end
 
   def wait_for_snak_value_box
     wait_until do
       snak_value_input_field.present?
     end
   end
 
   def wait_for_statement_request_finished
     wait_until do
       self.claim_edit_mode? == false
     end
   end
 
   def wait_for_statement_save_button
     save_statement_element.when_visible
   end
 
   def get_string_snak_value(value)
     '"' + value + '"'
   end
 end