Many cleanup and fix

rog-aura/src/aura_detection.rs

@@ -91,6 +91,7 @@ impl LedSupportFile {
                 if !config.product_id.is_empty() {
                     info!("Checking product ID");
                     if config.product_id == product_id {
+                        info!("Matched to {}", config.product_id);
                         return Some(config.clone());
                     } else {
                         continue;
@@ -192,6 +193,7 @@ mod tests {
 
         // Ensure the data is sorted
         let mut tmp_sort = tmp.clone();
+        tmp_sort.0.sort_by(|a, b| a.product_id.cmp(&b.product_id));
         tmp_sort.0.sort_by(|a, b| a.device_name.cmp(&b.device_name));
         if tmp != tmp_sort {
             let sorted =

rog-aura/src/keyboard/power.rs

@@ -276,7 +276,6 @@ impl From<OldAuraPower> for u32 {
 
 #[cfg(test)]
 mod test {
-    use crate::aura_detection::LedSupportData;
     use crate::keyboard::{AuraPowerState, LaptopAuraPower};
     use crate::{AuraDeviceType, PowerZones};