ZEN-15670

Contains unit tests fix