Add proper instrumentation test