DEVP-2665: changes for tests