impl/EZP-22217 Added unit tests