Move model tests to the right place.
Merge pull request #355 from francisco-dlp/Fix_test_model_location

Move model tests to the right place.
autopep8
Merge branch 'Fix_test_model_location'
Merge branch 'master' into 0.7.2