Attempt to fix #813:

Created by: JoKeyser

Hi, not sure about this one, but my sense of orderliness gets nervous with perpetually failing tests... This let's all tests run fine. Hope I'm not "scooping" @Marauderer97 , again not sure about the etiquette. However I'm also curious whether this solution makes sense, I'm new to unittest's mock.