Fix the test
Merge branch 'feature/v0.1' into develop