Updated: Added unit tests for EZP-23343