Test suite improvement