cleanup tests
Merge remote-tracking branch 'origin/develop' into 0.0.5