Update testing files for rr changes, and get instrumentation working on FF.