EZP-22400: Fixed tests