Added more unit tests
Merge pull request #4 from Beanalby/master

unit tests