This entire thing is a really super fragile piece of code, so I'd appreciate a concrete test for this, with its own ticket