Update tests to new configuration.
Update tests to new configuration.
Fix vocabulary bugs.
Reorganize aenea to make writing grammars easier.