Test file inclusion, and initial test suite for models
Cleanup on model tests and wrap up