second round of new api fixes + tests