- Move persistence keys to DataModel
- Disallow setting data model values to null
- Add test for DataModelImpl restoreState with no data and when using tax rate