Troscoe issue 110

This is based on @EvanKrall's branch, but with less reimplementation of mock.patch.