Test instrumentation rework.