Updates to training models and tests
Fix for Makefile.ParameterizedModel