Added UnitTests