Test suite improvements