Fixes for the resilience testing logic