EZP-22318: Fixed tests
EZP-22318: Added tests