Clean up
Fix test
Release 0.0.3