Added some unit test