CFY-1232 start adding unit tests