Add chunk persistence tests, fix storage tests.

Change-Id: Id0b8f5382e99efa839cc0f826e92bbda985fe9a9