Added more tests
Merge pull request #1 from BrandonEMiller/master

Added more tests