Merge branch 'hotfix/0.4.1'
Fix unit tests
Merge branch 'hotfix/0.4.2' into develop