Address assorted warnings
Merge pull request #1579 from petergoldstein/feature/issue_1578

Fix warnings in tests