Added unit tests
.