Fix for new unit tests failures.