Added some more test