restores a bit of python2 compat
remove change to testing