Improve test resources