addressed code review feedback, except for one comment on python test discovery.