Moved tests, reformatted code to 4 spaces
Normalized case, ignored punctuation for words