Fix test
US772 - Add toggle
Ensure tests get run