Added some further basic tests