Added option for multiple model directories
Added tests