Added some initial unit tests