storage_tests now all pass under mocking, too.

Refactored a few more Storage service utilities into Common to do so.