Fix smoketest to be more rugged around None
Move config to sample

Add comments