Merge branch 'release/0.0.5'
Fix tests
Fix tests