Fix settings tests
Merge pull request #475 from owdqa/bug/fix_settings_v20

Fix settings tests