fix up test to pass on core branch
Merge remote-tracking branch 'origin/core' into headless