Start of unit test for this class
Merge remote branch 'origin/unstable_staging' into unstable_staging