Balance tests improved
Charge tests improved