Make tests N_ aware
Update changelog
Fix settlement range decrease test
All tests GREEN
Simplify code in settlement end
updated preview
Merge pull request #2249 from Zappaman/editor

Fix #2016. Update editor preview