Minor improvements to test suite.