Devoncarew fix tests

Logging and test changes to try and address two flaky tests.

(TBR)