CFY-1152 make some fields not required
CFY-1152 add some unit tests
CFY-1152 some more unit tests