Ensure models are only created when running tests
Merge pull request #18 from michaelmior/short-model-names

[update] Ensure models are only created when running tests