EZP-22999: simplify mock a bit