Merge "Fix RI testing."