Can I suggest that we use a function scoped yield fixture here and then clean up in the fixture?