fixed repeated case for pickup in test and added getBattPercent() to get charge percentage