* new apis and tests * more tests and stuff * fix test fail * test review * api review --------- Co-authored-by: iaada <iaada@users.noreply.github.com>