Fix storage tests