Fix core model tests when running with clean maven repo
Merge pull request #6450 from stuartwdouglas/core-model-test-fix

Fix core model tests when running with clean maven repo