SWITCHYARD-1838 - Fixes for model loading and issue with validator
creation discovered