#4137 Fixing RO end to end tests