Cleanup and tests around non-persistent setting