clean up some TODOs
functional api testing