Partial update of models.  Tests are still broken and there are some other issues that need to be resolved.  Getting this uploaded so that @Chethan can take a look at what's changed and modify their proposal

That's what the README suggests and - more importantly - the cmake
config file works with.
Also use angle brackets instead of quotation marks in two cases.