Added some more basic tests