Added some basic tests