Basic API support with tests