CFY-516 fixing tests...