EZP-20948: Fixed remaining tests