Added some UnitTests