Storage refactored to use parcel.
Implemented Tests for Parceling
Fixed Unit-Tests