DEVP-3025: fixed tests