Fix a couple of warnings.
Merge pull request #2847 from waywardmonkeys/fix-some-test-other-warnings

Fix a couple of warnings.