Merge "Migrate several PowerStats tests to Ravenwood" into main