Up to 9.35 - Rspec tests need fix for Settings page