Fixes Calo unit tests
In testing of the: !41123 (merged) the issues in unit tests (trivial ones) were uncovered. They were due to the changes from the MR !40973 (merged) This MR makes tests a bit more robust.
In testing of the: !41123 (merged) the issues in unit tests (trivial ones) were uncovered. They were due to the changes from the MR !40973 (merged) This MR makes tests a bit more robust.