Fix and enable general and user settings tests.
Merge pull request #3773 from jaswilli/settings-tests

Fix and enable general and user settings tests.