CFY-1196 fix cfy usage in system tests