Two more UnitTest fixes (for TeamMCity)