Improve test suite setup