Herrera back to fitness and raring to go