Refs #6. Maybe only mark things as a failure when they fail?