Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
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.