Added some basic unit tests (more to come...)