** Added unit tests