Feature/cfy 865 add tests

remove # TODO