Merge branch '2021-03-12-test-improvements' into next

- Assorted improvements to the pytest framework