* several updates * avoid the instrumented step in tests
so it can be used to compare master and PR coverage