[TEST] - Fixing failing unit tests in CI

@pamval please review.