Add HSK, improvements to cedict loader
Fix tests