Simplify inherited child check to not use isinstance
Group the model-inheritance-related tests together