Unify storage tests