Merge pull request #641 from jkczyz/2020-06-deterministic-test-logging