Working on unit tests for v0.1.6