Fixes tests
Merge remote-tracking branch 'origin/develop' into release/1.0.0