Tests are corrected in order to avoid going to SystemFailure state