test: fix tests for ubuntu box.
Merge branch 'feature-test'