Fixup storage parts of tests

Change-Id: I1488ee2f430b705329b8ff76e344fdbe489ca290