More unit tests
Merge branch 'unstable_staging'