test suite improvements.