New API
Update tests' structure; add tests
Update docs