Merge pull request #11860 from eileenmcnaughton/test_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 22 Mar 2018 11:51:52 +0000 (00:51 +1300)
committerGitHub <noreply@github.com>
Thu, 22 Mar 2018 11:51:52 +0000 (00:51 +1300)
[nfc] Minor test tidy ups


Trivial merge