-better exit handling
-moved models to test resources