* Added unit tests