Adding some basic tests