Revert to documented API
Revert tests to documented API
0.5.2