TMDM-7455: Fix unit test regression following new entity types in test data model.

(cherry picked from commit 3ad9a2c66cede3bf837bb2bf92290467a38508bc)
(cherry picked from commit 974b403)