* additional sensors, some cleanup in yaml * re-add updated tests/data/enexus_smartpacks2.json * some rework to avoid regression * sensor grouping * update test data