I may try to land the pytest upgrade, since I’ve figured out the problem