Added more test cases, and added more mocks
Messed up test names there, whoops
Merge pull request #7 from hassankhan/master

Added more tests!!!