My attempt to clean up the test to doesn't reproduce the issue, so I'm going to encourage people to work with the test as originally posted. Sorry for the mess.