Update API and tests to match
0.1.0