New API. Fixed tests will follow!