EZP-21324: Added more tests