Added some unit testing