MOAR SPECS
Fix more model specs
Merge branch 'new-data-model' into feature/amend-imports
import for aac is working