DEVP-3025: changes for tests