Pr/expanded api and tests