It'd be nice if we could use the `fixture(...)` stuff in the tests. I realize that'd be a bit of work to update, tho.