** Added basic unit tests