EZP-20321: Tests improvements