Further refinement to pytest5