Improve test suite.