Fix EZP-22617: Added tests (unit & integration)
Fixed for unit tests