Starting to add the stopword check
Fixed unit test