EZP-21990: Improved test coverage