Fixed #18586 -- Split up model_package.ModelPackageTests.