Added additional tests
Merge pull request #6 from bradbeam/tests

Added additional tests