Exposing them to control the scope from elsewhere
Handle test scope correctly.
This flag was never set to false