ensure mappings created
fix tests
Merge pull request #38 from universalcore/feature/issue-38-add-mappings-for-models

add mappings for models