Remove unused method, fix some whitespace issues and add test cases for ...

...Thesaurus modifications