R4.x upgrade work; same single failing rspec test