Pull in changes from fork's tests/__init__.py