#1043, #1068: Fix autoFocus test suite issue