unit tests
Merge pull request #33 from jembi/unit-test-4

unit tests