Improve test suite files