Clean up mock runner junk a little
Clean up mock runner junk a little

kejbaly2/invoke,mattrobenolt/invoke,frol/invoke,kejbaly2/invoke,pyinvoke/invoke,mkusz/invoke,singingwolfboy/invoke,pfmoore/invoke,frol/invoke,tyewang/invoke,pfmoore/invoke,sophacles/invoke,mkusz/invoke,pyinvoke/invoke,mattrobenolt/invoke