Test suite improvements.