Added more tests.
Merge pull request #96 from swansond/more-testing

Added more tests.