don't save settings in test mode
Merge branch 'develop'