Adding UnitTests