Added some basic tests and functionality