UnitTests added