Fix for more possible unit test failures