Run monkey patches earlier, so they won't get missed due to earlier imports.  Fix corresponding tests
5 files changed