Merge "Cleans up some uses of test scope and dispatcher" into main