Merge pull request #1413 from srawlins/raw-test

Comply with strict-raw-types in test package.