CFY-649 fix more tests