Added more tests
Merge pull request #107 from blee92/master

Added more tests