CFY-1000 fixing tests...