Update the model test to use the URLs in the yml files rather than hard
coded stuff.
Merge