#245 Fixed e2e tests and added refined fallback with labels also to the step image.