Minimal test code cleanup
Merge pull request #540 from lossyrob/ps/testcoverage

Minimal test code cleanup