fixing failing tests
Merge branch 'release/0.0.7' into dev