Fixed bugs with storage remove unit tests