still some tests left expecting the old instrumentation