Fix some unit tests
Fix unit test
Merge remote-tracking branch 'origin/devel' into opportunistic