Fixes & improvements for resilience tests