EZP-21213: Added test cases