An extra test that should have been in commit 6781.
This was surprisingly hard; bugs discovered all over the place.