Added some basic unit tests