api clean up
unit tests extended