Added unit tests
Merge pull request #2 from trobert2/master

Added unit tests