storage/v2: more explicit machine config init

Use a context manager and an explicit machine config arg per test to
help clarify the background machine assumptions.

Restructure tests for the above, and to make them more targeted on a
single idea per test.