Modifies tests to use new volume objects.