refactors stubs to allow for more granular expectations and nested should-invoke's
Merge pull request #76 from mylesmegyesi/stubs-refactor

Nested stubs and more granular expectations on stubs