Merge "Fix instrumentation tests"