Fix failing rspec & cucumber tests from UI rework.