Added some test, will add more soon