Use the helper from dummy storage

- Have to adjust the rest of the code to accommodate this.
Migrating to usage of test layers.