Make the recently added tests Python 3 compatible