Issue #1041: Test changes