bring back instrumentation tests