Some changes in UnitTest4.cs
Extended TODO file