CFY-1295 add tests