CFY-1433 add and improve tests