Simplified API, more tests.