Fixing issues in resilient_tests