Remove useless import
Fix tests to be python2.6 compatible