tests: cleanup TestSuite a bit.