Fix small setup token issues identified in review

Properly nulls settings and adds a test that setup token can't be used anymore

Fixes #50 (closed)