CFY-1433 more tests