fix images instrumentation tests
another hack removed