[TEST] - Fixing failing unit tests in CI