Fix a couple of test models and updated error message