@bgchun makes sense. I think I'll leave tests untouched for now, and come back to it later when we fix the API