This fixes #8280.  It now tests almost everything.