[BUGFIX] Fix Unit Tests

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

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