charge_cycle removed cruft refactored test