Simplified test setup using a parameterised fixture. The VFS test is now just a single test that handles its own clean up.