Storage tests fix