More unit tests
Merge branch 'master' into concurrent-wrappers