Jenkins triage fixes

[dheyay]

Why is this needed?

Fixes for integration test issues I found during the jenkins triage.

Test Steps

Checklist

• [x] I have updated or added any unit tests accordingly
• [x] I have updated or added any integration tests accordingly
• [ ] Changes here need to be documented, and this was done in:

Does this PR require extra reviews?

• [ ] Yes
• [ ] No

[github-actions[bot]]

Jira: This PR is not related to a Jira item. (The PR title does not include a SC-#### reference)

GitHub Issues: No GitHub issues are fixed by this PR. (No commits have Fixes: #### references)

Launchpad Bugs: No Launchpad bugs are fixed by this PR. (No commits have LP: #### references)

Documentation: The changes in this PR do not require documentation changes.

👍 this comment to confirm that this is correct.

[dheyay]

Updated! @athos-ribeiro