Adding more UnitTests