Couple more unit tests, and a little more unit test coverage
Merge remote branch 'origin/master' into unstable_staging