Once more, get the upstream fixes for UnitTest.