Clarify pytest fixes and additions (rebase)

This is a follow on to #539 adding some fixes from the review of the rebase on the dev_4_4 branch.

--rebased-from #542