Merge "Make scenario tests able to run with DHSS=False"