Fixing a test and style error for bug #7579.