Fix up some pytest-related stuff (#601)

3 files changed