Couple more small and simple unit tests to increase coverage
Merge branch 'master' into unstable_staging