Updated the tests
Merge branch 'hotfix/0.2.2'