Improve Instrumentation Tests