DEVP-2665: fixed tests