EZP-20399 - Fixed tests