I see more failures than I'd like now that I've converted this test to go end-to-end:

It's not clear to me why this is happening, so I'd like to spend some time figuring it out. I need to either do that, or unwind that change until things start passing again.