Improved test resiliency