revisions to allow test discovery by pytest