[Git] Attempt 2 at fixing UnitTests for bots.