Fixing tests for python3x thate I broke by importing __builtin__