Added basic unit tests