storage collection refacoring tests are done.