[BUGFIX] Fix Unit Tests - part 2

This is a quick "fix" prior to release on TER

Change-Id: Ifad32982497da4846d80f4ea3b2f9ac26985a8ee
Releases: 0.2.0
Resolves: #54663