Refactoring of thesaurus array import  + unit tests