More tests and API.