[#1708] Fixing the failing tests in cucumber capybara