Trying to fix tests on various versions of Python