HEMERA-3577: All tests green