This series just adds tests for Rob's fix. I'm resending Rob's patch as well because I added a single deletion (of the known_broken test).