The build failure is directly related to the conflicting model name I reported 6 months ago.

@charettes Want to expand in a more actionable way - specifically what needs to change here?
I'd prefer those models to be in the scope of the test unless there's a reason why that's not possible - make sense right?

Actually I moved those models for the 1.7 compat and the merge added them a second time.
@tomchristie this is still possible but they need to have different names.

@tomchristie they'll need different names in this case.