Small unit test improvements to get a little more code coverage
Merge branch 'master' into unstable_staging