Make modifications to test btrace instrumentation