Implemented unit tests for TODO notes, but added TODO notes to reduce code duplication
Merge branch 'master' into unstable_staging
Merge remote branch 'origin/unstable_staging' into unstable_staging