Fixed up API, tests green again