Fixed storage tests