[#79271022] Fix more unit-tests.