Minor fixes not worthy of individual pulls

Removes workaround used in python2.5 which is no longer relevant including the code.
Fixes a tiny issue with bundling files cache files along with the tests.