update settings and settings tests