-Cleaned up test code to be a bit more efficient
-Started main battery integration using new BatteryEntity from internal API