Added a number of UnitTests