Undoing the yield magic like a baws
Cleanup lol
context manager yanked; tests passing again