EZP-22414: Added test