Fix issues with 2.6 (set comprehension) and 3.3 (test import)