Tests not passing, battery dieing though