Refactor tests
Release 0.0.2