FIX: tests for pull request #8548