EZP-22597: Fix tests
EZP-22597: Added tests