builder/amazon: fix test failures

builder/amazon/common/step_run_source_instance.go

@@ -111,7 +111,7 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 			if price == 0 || current < price {
 				price = current
 				if s.AvailabilityZone == "" {
-					availabilityZone = history.AvailabilityZone
+					availabilityZone = *history.AvailabilityZone
 				}
 			}
 		}
@@ -167,7 +167,6 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 		ui.Message(fmt.Sprintf(
 			"Requesting spot instance '%s' for: %s",
 			s.InstanceType, spotPrice))
-		D
 		runSpotResp, err := ec2conn.RequestSpotInstances(&ec2.RequestSpotInstancesInput{
 			SpotPrice: &spotPrice,
 			LaunchSpecification: &ec2.RequestSpotLaunchSpecification{