PMO-2800 fix tests