Part two of models redesign.
Added simple tests.
In the middle of work. Upgrade process.