Adding more unit tests
Merge pull request #284 from frsela/unittests

Adding more unit tests