Improve the API further
Public API now uses the correct methods

Tests are marginally less failing