Merge "Fix health.storage test"