CFY-781 fixing tests