Add tests of models
Fix new lines at EOF