Send all settings interactions to the settings page, and fix tests.  Add a few more tests around the settings page, specifically for new key and new domain.