Fix district model and district unit tests rework