Made existing API tests pass