Added a couple of basic tests