Improve test configuration