CFY-1324 fix broken tests