Merge "Transition more PowerStats tests to Ravenwood" into main