- success! majority of tests are working again
- fixes to data model
- use correct references to data model