(wip) removing wait_until and adapting steps to capybara 2.1.0