Merge "Run settings tests when adding settings"