Use imp.load_module() rather than runpy.run_path()
Use TestCase.addCleanup() rather than overriding TestCase.tearDown()
Merge remote-tracking branch 'github'

Conflicts:
	test_svn_fex.py
Fix up module object usage after merge with new test