fix tests
Merge branch 'release/0.9.3' into develop