Update tests to change of RI type.
Started backtracking RI generator.