#4137 Fix RO tests