Move loading methods to a new module.
Move loading methods to a new module.
Add new tests for the vocabulary expansion.