Remove unreliably working test.
Use a more generic vocab binder.
Extend tests.