Merge "Fix method tracing tests on RI"