Fixed black box test and resolved conflicts.
Fixed black box test and resolved conflicts.

openai/cleverhans,cleverhans-lab/cleverhans,carlini/cleverhans,cleverhans-lab/cleverhans,cleverhans-lab/cleverhans,carlini/cleverhans