CFY-769 fixing tests