removed unused RI controller methods, added final test