Merge "Allow method tracing for run-test"