PMO-2352: fixed tests