use mock.patch to control patch state; improve tests
clean up patch/unpatch tests
Merge pull request #3 from venmo/fix_unpatching

use mock.patch to control patch state; improve tests