I will attach a test but again the problem is with the 'old' instrumentation and not the 'enhancer'.