Vocabulary now uses new configuration.
Fix broken tests.