CFY-768 fix broken tests