Make test git branch run on Python 2 and 3