Fix the settlement-range test again.
Fix errors in removing settlement buildings.