Added some more unittest