Cleanup imports and finally fix add_multiple_files test for Python 2.6