EZP-20817: Fixed unit tests