Added some test unit tests