Added unit tests for EZP-21986