Rename a couple tests
Add a tokenize method to the parser and expose it in the server