Merge "Fix RSpec::Expectations::ExpectationNotMetError in Selenium tests"