#535 cleaned up some of how mounts are handled, but it wasn't easy to test the changes because we have no tests for mounts. We should add some tests that exercise mount config.
