more instrumentation and tests