The kit on the bike one would think is good , for a test connect the charger wires direct to the controller/ battery connection. The motor will work if all is ok.
Battery wise a new wisper or any 2 wire generic battery will work, one can even buy rack batteries with a new rack to be 100% sure...