Added some new unit tests