fixes to instrumentation tests