EZP-19948 - Added tests