EZP-21964: complete  test coverage