Add more tests to tokenize
Refactor tokenize to use str::words
Rename addspaces to pad_parentheses and add tests