Add more tests for instrumentation