Do not provide a default vocabulary if none is provided, and fix the tests