unit tests
Merge pull request #36 from jembi/unit-test-7

unit tests