Fix and enable general and user settings tests.

Changes to tests only.