test: update unit tests
Merge remote-tracking branch 'origin/0.4' into 0.4