Fix the test
Merge branch 'feature/v0.1' into develop
Merge pull request #27 from continuuity/develop

Fix test