Added some more test
Changed a little how words are split