Fix headword tests
Prepare 'syntax' along 'structure' and 'roles'

The goal is to replace 'structure' and 'roles' with syntax eventually.