Some changes in UnitTests