Add hyphen to word separators
Better tests