Merge "RRO tests: fix potential NPE"