EZP-20424 - Fixed failing unit tests