DEVP-3071: Fixed tests