Better tests for b71aabb4f440dbd50b389995746aad3bcefa4160
Support setup.py test