CFY-1373 fixed branch for tests