Fixing failing unit tests

[#79483828]]