fixed two intermittent tests
adjust test logging
nits
Merge pull request #1323 from devoncarew/devoncarew_fix_tests

Devoncarew fix tests