Enhance Spellchecker and the tests