Improve test environment