Added tests and the beginnings of a tokenizer