Work on bug #7768.  More tests were added.