Fix smoketest to be more rugged around None