[1.7.x] Further consolidated the model_inheritance tests.

Backport of 3f01e82 from master