Fix test
US772 - Add toggle
Ensure tests get run
Merge branch 'development' into dev_merge