Updates on UnitTests