Improved test resources