Backport of 0ed7d15563 from master
0ed7d15563
The model_inheritance_same_model_name tests couldn't be run without the model_inheritance tests. Make the problem go away by merging them. Thanks timo for the report.