Merge "Revert "Run settings tests when adding settings""