Storage implementation tests fix