I note in passing that this is never used as a fixture, just as a function in various different places.  So does it need the fixture decorator at all?