continued to refactor and clean up tests
start refactoring lexicon construction code