diff --git a/libs/utils/energy.py b/libs/utils/energy.py
index 96d1c2fee8df6e71881382b702953e9fbe743e39..8dc9c1602200304f252735a80659c0c6e956aae5 100644
--- a/libs/utils/energy.py
+++ b/libs/utils/energy.py
@@ -112,9 +112,7 @@ class HWMon(EnergyMeter):
             return
         samples = self._hwmon.take_measurement()
         for s in samples:
-            label = s.channel.label\
-                    .replace('_energy', '')\
-                    .replace(" ", "_")
+            label = s.channel.label.replace('_energy', '')
             value = s.value
 
             if label not in self.readings:
@@ -125,13 +123,9 @@ class HWMon(EnergyMeter):
                         }
                 continue
 
-            last  = self.readings[label]['last']
-            delta = value - last
-            total = self.readings[label]['total']
-
+            self.readings[label]['delta'] = value - self.readings[label]['last']
             self.readings[label]['last']  = value
-            self.readings[label]['delta'] = delta
-            self.readings[label]['total'] = total + delta
+            self.readings[label]['total'] += self.readings[label]['delta']
 
         logging.debug('SAMPLE: %s', self.readings)
         return self.readings
diff --git a/tests/eas/rfc.py b/tests/eas/rfc.py
index 364468893f53325d971929dfd60ac4586793d25f..ef36fe3e9ffdb57bf830f35ccf3565c2f3b7eb7e 100644
--- a/tests/eas/rfc.py
+++ b/tests/eas/rfc.py
@@ -242,9 +242,13 @@ class TestBase(unittest.TestCase):
             cls.env.target.execute(
                     'for CPU in /sys/devices/system/cpu/cpu[0-9]*; do   '\
                     '   echo {} > $CPU/cpufreq/scaling_governor;  '\
-                    '   echo {} > $CPU/cpufreq/ondemand/sampling_rate;  '\
+                    '   if [ -e $CPU/cpufreq/ondemand/sampling_rate ]; then'\
+                    '       echo {} > $CPU/cpufreq/ondemand/sampling_rate;'\
+                    '   else'\
+                    '       echo {} > $CPU/../cpufreq/ondemand/sampling_rate;'\
+                    '   fi;'\
                     'done'\
-                    .format('ondemand', sampling_rate))
+                    .format('ondemand', sampling_rate, sampling_rate))
         else:
             cls.env.target.execute(
                     'for CPU in /sys/devices/system/cpu/cpu[0-9]*; do   '\