Improved testes and the API.