Remove storage_policies paramater

Add some mocking to standardize how we move around storage policies in tests.

Change-Id: Ia1e71edde32c5f4a6ae13855c6d13098480733d9