Fix combat tests