Merge "Move BatteryStats and PowerStats tests to their own module" into main