Merge "Unit Test for Error Resilience Mode"