Added some unit tests