Had a resurgence of a bug I was pretty sure I fixed, but it came back. Adding some tests to make sure we catch it if it comes back again.